1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNX: Don't build QNX-only parts on BlackBerry

Browse Source 
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>
This commit is contained in:
Bernd Weimer 2014-05-02 16:00:42 +02:00 committed by The Qt Project
parent 5883b6a22c
commit da6dc40f75
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/platforms/qnx/qnx.pro
View File

@ -121,18 +121,22 @@ CONFIG(blackberry-playbook) {
CONFIG(qqnx_pps) { CONFIG(qqnx_pps) {
DEFINES += QQNX_PPS DEFINES += QQNX_PPS
SOURCES += qqnxnavigatorpps.cpp \ SOURCES += qqnxclipboard.cpp \
qqnxnavigatoreventnotifier.cpp \
qqnxvirtualkeyboardpps.cpp \
qqnxclipboard.cpp \
qqnxbuttoneventnotifier.cpp qqnxbuttoneventnotifier.cpp
HEADERS += qqnxnavigatorpps.h \ HEADERS += qqnxclipboard.h \
qqnxnavigatoreventnotifier.h \
qqnxvirtualkeyboardpps.h \
qqnxclipboard.h \
qqnxbuttoneventnotifier.h qqnxbuttoneventnotifier.h
!blackberry {
SOURCES += qqnxnavigatorpps.cpp \
qqnxnavigatoreventnotifier.cpp \
qqnxvirtualkeyboardpps.cpp
HEADERS += qqnxnavigatorpps.h \
qqnxnavigatoreventnotifier.h \
qqnxvirtualkeyboardpps.h
}
LIBS += -lpps LIBS += -lpps
!contains(DEFINES, QT_NO_CLIPBOARD): LIBS += -lclipboard !contains(DEFINES, QT_NO_CLIPBOARD): LIBS += -lclipboard

4
src/plugins/platforms/qnx/qqnxintegration.cpp
View File

@ -67,12 +67,12 @@
#include "qqnxvirtualkeyboardbps.h" #include "qqnxvirtualkeyboardbps.h"
#elif defined(QQNX_PPS) #elif defined(QQNX_PPS)
#include "qqnxnavigatorpps.h" #include "qqnxnavigatorpps.h"
#include "qqnxnavigatoreventnotifier.h"
#include "qqnxvirtualkeyboardpps.h" #include "qqnxvirtualkeyboardpps.h"
#endif #endif
#if defined(QQNX_PPS) #if defined(QQNX_PPS)
# include "qqnxbuttoneventnotifier.h" # include "qqnxbuttoneventnotifier.h"
# include "qqnxnavigatoreventnotifier.h"
# include "qqnxclipboard.h" # include "qqnxclipboard.h"
# if defined(QQNX_IMF) # if defined(QQNX_IMF)
@ -284,7 +284,7 @@ QQnxIntegration::~QQnxIntegration()
#endif #endif
// Stop/destroy navigator event notifier // Stop/destroy navigator event notifier
#if defined(QQNX_PPS) #if !defined(Q_OS_BLACKBERRY) && defined(QQNX_PPS)
delete m_navigatorEventNotifier; delete m_navigatorEventNotifier;
#endif #endif
delete m_navigatorEventHandler; delete m_navigatorEventHandler;