diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2015-03-29 16:02:53 +0100 |
|---|---|---|
| committer | Sérgio Martins <sergio.martins@kdab.com> | 2015-04-01 10:24:24 +0000 |
| commit | 20c651d8b8c18ed123b84162fe4531eb4f414509 (patch) | |
| tree | d295179b8fe0d5d8ffa6a626b5412b60361bbc19 /src/corelib | |
| parent | c1a67e7dc3a6f8876efa32cdbabbfde1c5a37bc6 (diff) | |
Fix QNX and Blackberry -qtnamespace build
Task-number: QTBUG-43569
Change-Id: I81a560d1508de4d808a807f1febdc17619cf4dda
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_blackberry.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qppsattribute.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qppsattribute_p.h | 5 | ||||
| -rw-r--r-- | src/corelib/kernel/qppsobject.cpp | 4 |
4 files changed, 13 insertions, 2 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_blackberry.cpp b/src/corelib/kernel/qeventdispatcher_blackberry.cpp index 047e3dff07..7a70f5cb58 100644 --- a/src/corelib/kernel/qeventdispatcher_blackberry.cpp +++ b/src/corelib/kernel/qeventdispatcher_blackberry.cpp @@ -49,6 +49,8 @@ #define qEventDispatcherDebug QT_NO_QDEBUG_MACRO() #endif +QT_BEGIN_NAMESPACE + class BpsChannelScopeSwitcher { public: diff --git a/src/corelib/kernel/qppsattribute.cpp b/src/corelib/kernel/qppsattribute.cpp index 09d8d1bb0c..b77ea0b643 100644 --- a/src/corelib/kernel/qppsattribute.cpp +++ b/src/corelib/kernel/qppsattribute.cpp @@ -37,6 +37,8 @@ #include <QDebug> #include <QVariant> +QT_BEGIN_NAMESPACE + /////////////////////////// // // QPpsAttributePrivate @@ -297,3 +299,5 @@ QDebug operator<<(QDebug dbg, const QPpsAttribute &attribute) return dbg; } + +QT_END_NAMESPACE diff --git a/src/corelib/kernel/qppsattribute_p.h b/src/corelib/kernel/qppsattribute_p.h index 209a8c3101..73beb7c96f 100644 --- a/src/corelib/kernel/qppsattribute_p.h +++ b/src/corelib/kernel/qppsattribute_p.h @@ -57,8 +57,6 @@ class QPpsAttribute; typedef QList<QPpsAttribute> QPpsAttributeList; typedef QMap<QString, QPpsAttribute> QPpsAttributeMap; -Q_DECLARE_METATYPE(QPpsAttributeList) -Q_DECLARE_METATYPE(QPpsAttributeMap) class Q_CORE_EXPORT QPpsAttribute { @@ -128,4 +126,7 @@ Q_CORE_EXPORT QDebug operator<<(QDebug dbg, const QPpsAttribute &attribute); QT_END_NAMESPACE +Q_DECLARE_METATYPE(QPpsAttributeList) +Q_DECLARE_METATYPE(QPpsAttributeMap) + #endif // QPPSATTRIBUTE_P_H diff --git a/src/corelib/kernel/qppsobject.cpp b/src/corelib/kernel/qppsobject.cpp index 9a5ae3c7a4..612e756881 100644 --- a/src/corelib/kernel/qppsobject.cpp +++ b/src/corelib/kernel/qppsobject.cpp @@ -50,6 +50,8 @@ #include <sys/pps.h> +QT_BEGIN_NAMESPACE + /////////////////////////////////////////////////////////////////////////////// static inline void safeAssign(bool *pointer, bool value) { @@ -954,3 +956,5 @@ int QPpsObject::sendMessage(const QString &path, const QByteArray &ppsData) return EOK; } + +QT_END_NAMESPACE |