From 20c651d8b8c18ed123b84162fe4531eb4f414509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Martins?= <sergio.martins@kdab.com>
Date: Sun, 29 Mar 2015 16:02:53 +0100
Subject: Fix QNX and Blackberry -qtnamespace build

Task-number: QTBUG-43569
Change-Id: I81a560d1508de4d808a807f1febdc17619cf4dda
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
---
 src/plugins/platforms/qnx/qqnxfilepicker.cpp       | 4 ++++
 src/plugins/platforms/qnx/qqnxfilepicker.h         | 4 ++++
 src/plugins/platforms/qnx/qqnxsystemsettings.h     | 4 ++--
 src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.h | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/plugins/platforms/qnx')

diff --git a/src/plugins/platforms/qnx/qqnxfilepicker.cpp b/src/plugins/platforms/qnx/qqnxfilepicker.cpp
index 9362f9cd0b..4853dce9d9 100644
--- a/src/plugins/platforms/qnx/qqnxfilepicker.cpp
+++ b/src/plugins/platforms/qnx/qqnxfilepicker.cpp
@@ -55,6 +55,8 @@
 #define qFilePickerDebug QT_NO_QDEBUG_MACRO
 #endif
 
+QT_BEGIN_NAMESPACE
+
 static const char s_filePickerTarget[] = "sys.filepicker.target";
 
 QQnxFilePicker::QQnxFilePicker(QObject *parent)
@@ -322,3 +324,5 @@ QString QQnxFilePicker::modeToString(QQnxFilePicker::Mode mode) const
 
     return QStringLiteral("Picker");
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qqnxfilepicker.h b/src/plugins/platforms/qnx/qqnxfilepicker.h
index 82df1ea32d..63832633d8 100644
--- a/src/plugins/platforms/qnx/qqnxfilepicker.h
+++ b/src/plugins/platforms/qnx/qqnxfilepicker.h
@@ -38,6 +38,8 @@
 #include <QObject>
 #include <QStringList>
 
+QT_BEGIN_NAMESPACE
+
 struct navigator_invoke_invocation_t;
 
 class QQnxFilePicker : public QObject, public QAbstractNativeEventFilter
@@ -100,4 +102,6 @@ private:
     QString m_title;
 };
 
+QT_END_NAMESPACE
+
 #endif // QQNXFILEPICKER_H
diff --git a/src/plugins/platforms/qnx/qqnxsystemsettings.h b/src/plugins/platforms/qnx/qqnxsystemsettings.h
index 3402243572..1f0e425f71 100644
--- a/src/plugins/platforms/qnx/qqnxsystemsettings.h
+++ b/src/plugins/platforms/qnx/qqnxsystemsettings.h
@@ -37,10 +37,10 @@
 #include <QtCore/qhash.h>
 #include <qpa/qplatformtheme.h>
 
-class QPlatformFontDatabase;
-
 QT_BEGIN_NAMESPACE
 
+class QPlatformFontDatabase;
+
 QHash<QPlatformTheme::Font, QFont *> qt_qnx_createRoleFonts(QPlatformFontDatabase *fontDatabase);
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.h b/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.h
index faba3409d9..0ced2340b0 100644
--- a/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.h
+++ b/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.h
@@ -86,4 +86,6 @@ private:
     static const size_t ms_bufferSize;
 };
 
+QT_END_NAMESPACE
+
 #endif // VIRTUALKEYBOARDPPS_H
-- 
cgit v1.2.3