[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=e11daf4

The following commit has been merged in the master branch:
commit e11daf41c21aae5329323cf1f0ecb7ab2b1f6b82
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Jan 15 02:53:50 2013 +0100

    Improve the way we register uncreatable qml elements
    
    When the element is providing enums, we need to use qmlRegisterUncreatableType
    because otherwise QML doesn't know the class name and we can't access
    those with API such as: ClassName.EnumValue
    
    Reviewed by David Edmundson
---
 KTp/Declarative/qml-plugins.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/KTp/Declarative/qml-plugins.cpp b/KTp/Declarative/qml-plugins.cpp
index 7c68e53..e9c258d 100644
--- a/KTp/Declarative/qml-plugins.cpp
+++ b/KTp/Declarative/qml-plugins.cpp
@@ -44,10 +44,13 @@ void QmlPlugins::registerTypes(const char *uri)
     qmlRegisterType<PinnedContactsModel>(uri, 0, 1, "PinnedContactsModel");
     qmlRegisterType<ContactPin>(uri, 0, 1, "ContactPin");
 
-    qmlRegisterType<MessagesModel>();
+    qmlRegisterUncreatableType<AccountsFilterModel> (uri, 0, 1, "AccountsFilterModel",
+        QLatin1String("Filter cannot be created. Access through ContactList.filter"));
+    qmlRegisterUncreatableType<MessagesModel> (uri, 0, 1, "MessagesModel",
+        QLatin1String("It will be created once the conversation is created"));
+
     qmlRegisterType<ConversationTarget>();
     qmlRegisterType<ConversationsModel>();
-    qmlRegisterType<AccountsFilterModel>();
     qRegisterMetaType<Tp::AccountManagerPtr>();
     qRegisterMetaType<Tp::ContactPtr>();
     qRegisterMetaType<Tp::AccountPtr>();

-- 
ktp-common-internals packaging