[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ktp-common-internals/frameworks] KTp/Declarative: Merge branch 'master' into frameworks
From:       Aleix Pol <aleixpol () kde ! org>
Date:       2014-04-13 23:14:58
Message-ID: E1WZTc2-0005Y5-Bq () scm ! kde ! org
[Download RAW message or body]

Git commit 0f4237f52334ff51c49235780bfb6b8102a53a27 by Aleix Pol.
Committed on 13/04/2014 at 21:47.
Pushed by apol into branch 'frameworks'.

Merge branch 'master' into frameworks

Conflicts:
	KTp/Declarative/qml-plugins.cpp

M  +5    -2    KTp/Declarative/qml-plugins.cpp

http://commits.kde.org/telepathy-common-internals/0f4237f52334ff51c49235780=
bfb6b8102a53a27

diff --cc KTp/Declarative/qml-plugins.cpp
index 0777249,acac9e9..31153ae
--- a/KTp/Declarative/qml-plugins.cpp
+++ b/KTp/Declarative/qml-plugins.cpp
@@@ -32,9 -33,9 +32,10 @@@
  #include "filtered-pinned-contacts-proxy-model.h"
  #include "telepathy-manager.h"
  =

 +#include <TelepathyQt/PendingChannelRequest>
  #include "KTp/types.h"
  #include "KTp/global-presence.h"
+ #include "KTp/Models/presence-model.h"
  #include "KTp/Models/contacts-filter-model.h"
  #include "KTp/Models/contacts-model.h"
  #include "KTp/Models/accounts-list-model.h"
@@@ -63,11 -65,12 +66,11 @@@ void QmlPlugins::registerTypes(const ch
      qmlRegisterUncreatableType<MessagesModel> (uri, 0, 1, "MessagesModel",
          QLatin1String("It will be created once the conversation is create=
d"));
  =

-     qmlRegisterType<KTp::GlobalPresence> (uri, 0, 1, "GlobalPresence");
- =

      qmlRegisterType<TelepathyManager>();
      qmlRegisterType<ConversationsModel>();
 -
      qmlRegisterType<Tp::PendingChannelRequest>();
+     qRegisterMetaType<Tp::Presence>();
+     qRegisterMetaType<KTp::Presence>();
      qRegisterMetaType<Tp::AccountManagerPtr>();
      qRegisterMetaType<KTp::ContactPtr>();
      qRegisterMetaType<Tp::AccountPtr>();
[prev in list] [next in list] [prev in thread] [next in thread]