From da6dc40f75feead6c40786b720abd79962bd97e4 Mon Sep 17 00:00:00 2001
From: Bernd Weimer <bweimer@blackberry.com>
Date: Fri, 2 May 2014 16:00:42 +0200
Subject: QNX: Don't build QNX-only parts on BlackBerry

Only really required source files will be included when building for
BlackBerry.

Change-Id: Ic66b09221c48672358bba7601bc18663ad7fa07a
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
---
 src/plugins/platforms/qnx/qnx.pro             | 20 ++++++++++++--------
 src/plugins/platforms/qnx/qqnxintegration.cpp |  4 ++--
 2 files changed, 14 insertions(+), 10 deletions(-)

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

diff --git a/src/plugins/platforms/qnx/qnx.pro b/src/plugins/platforms/qnx/qnx.pro
index 856b7d2abe..b5c6b48931 100644
--- a/src/plugins/platforms/qnx/qnx.pro
+++ b/src/plugins/platforms/qnx/qnx.pro
@@ -121,18 +121,22 @@ CONFIG(blackberry-playbook) {
 CONFIG(qqnx_pps) {
     DEFINES += QQNX_PPS
 
-    SOURCES += qqnxnavigatorpps.cpp \
-               qqnxnavigatoreventnotifier.cpp \
-               qqnxvirtualkeyboardpps.cpp \
-               qqnxclipboard.cpp \
+    SOURCES += qqnxclipboard.cpp \
                qqnxbuttoneventnotifier.cpp
 
-    HEADERS += qqnxnavigatorpps.h \
-               qqnxnavigatoreventnotifier.h \
-               qqnxvirtualkeyboardpps.h \
-               qqnxclipboard.h \
+    HEADERS += qqnxclipboard.h \
                qqnxbuttoneventnotifier.h
 
+    !blackberry {
+        SOURCES += qqnxnavigatorpps.cpp \
+                   qqnxnavigatoreventnotifier.cpp \
+                   qqnxvirtualkeyboardpps.cpp
+
+        HEADERS += qqnxnavigatorpps.h \
+                   qqnxnavigatoreventnotifier.h \
+                   qqnxvirtualkeyboardpps.h
+    }
+
     LIBS += -lpps
     !contains(DEFINES, QT_NO_CLIPBOARD): LIBS += -lclipboard
 
diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp
index 41ca2b5e18..1110eb5f28 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.cpp
+++ b/src/plugins/platforms/qnx/qqnxintegration.cpp
@@ -67,12 +67,12 @@
 #include "qqnxvirtualkeyboardbps.h"
 #elif defined(QQNX_PPS)
 #include "qqnxnavigatorpps.h"
+#include "qqnxnavigatoreventnotifier.h"
 #include "qqnxvirtualkeyboardpps.h"
 #endif
 
 #if defined(QQNX_PPS)
 #  include "qqnxbuttoneventnotifier.h"
-#  include "qqnxnavigatoreventnotifier.h"
 #  include "qqnxclipboard.h"
 
 #  if defined(QQNX_IMF)
@@ -284,7 +284,7 @@ QQnxIntegration::~QQnxIntegration()
 #endif
 
     // Stop/destroy navigator event notifier
-#if defined(QQNX_PPS)
+#if !defined(Q_OS_BLACKBERRY) && defined(QQNX_PPS)
     delete m_navigatorEventNotifier;
 #endif
     delete m_navigatorEventHandler;
-- 
cgit v1.2.3