diff options
author | Bernd Weimer <bweimer@blackberry.com> | 2014-05-02 16:00:42 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-12 18:15:20 +0200 |
commit | da6dc40f75feead6c40786b720abd79962bd97e4 (patch) | |
tree | 18a97dc901be6bf2437baf39c28cd774c4479d6f | |
parent | 5883b6a22c7a484d2fed032d0c51f240f0ef9cd0 (diff) |
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>
-rw-r--r-- | src/plugins/platforms/qnx/qnx.pro | 20 | ||||
-rw-r--r-- | src/plugins/platforms/qnx/qqnxintegration.cpp | 4 |
2 files changed, 14 insertions, 10 deletions
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; |