[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=6514ad7

The following commit has been merged in the master branch:
commit 6514ad7c6299918d52f284efd60e65e9d4741038
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Apr 30 14:25:22 2013 +0200

    Don't use adhoc Q_DECLARE_METATYPE in header files unless the type is defined there
    
    For foreign structs, either use Q_DECLARE_METATYPE in .cpp file, or if it's used
    more often throughout the library, put it to types.h. Otherwise it can lead to
    'redefinition of struct QMetaTypeId' error when two headers are included from a
    single .cpp file, both calling Q_DECLARE_METATYPE on the same type.
    
    Fixes build breakage introduced in e66011d83da5712f56e5f480ffebff6823e295c8
---
 KTp/Models/accounts-list-model.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/KTp/Models/accounts-list-model.h b/KTp/Models/accounts-list-model.h
index 15619e5..0059f1b 100644
--- a/KTp/Models/accounts-list-model.h
+++ b/KTp/Models/accounts-list-model.h
@@ -27,6 +27,7 @@
 #include <TelepathyQt/Account>
 
 #include <KTp/ktp-export.h>
+#include <KTp/types.h>
 
 class KIcon;
 
@@ -76,7 +77,5 @@ private:
 
 }
 
-Q_DECLARE_METATYPE(Tp::AccountPtr)
-
 #endif // header guard
 

-- 
ktp-common-internals packaging