1 files changed, 74 insertions, 33 deletions
diff --git a/src/plugins/platforms/qnx/qnx.pro b/src/plugins/platforms/qnx/qnx.pro
index 82c3b201c9..7ca9ddf63a 100644
--- a/src/plugins/platforms/qnx/qnx.pro
+++ b/src/plugins/platforms/qnx/qnx.pro
@@ -2,15 +2,27 @@ TARGET = qnx
 include(../../qpluginbase.pri)
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
-QT += opengl opengl-private platformsupport platformsupport-private widgets-private
+QT += platformsupport platformsupport-private widgets-private
+
+contains(QT_CONFIG, opengles2) {
+    QT += opengl opengl-private
+}
 
 # Uncomment this to build with support for IMF once it becomes available in the BBNDK
 #CONFIG += qqnx_imf
 
+# Uncomment this to build with support for PPS based platform integration
+#CONFIG += qqnx_pps
+
+CONFIG(blackberry) {
+    CONFIG += qqnx_pps
+}
+
 # Uncomment these to enable debugging output for various aspects of the plugin
 #DEFINES += QQNXBUFFER_DEBUG
+#DEFINES += QQNXBPSEVENTFILTER_DEBUG
 #DEFINES += QQNXCLIPBOARD_DEBUG
-#DEFINES += QQNXEVENTTHREAD_DEBUG
+#DEFINES += QQNXSCREENEVENTTHREAD_DEBUG
 #DEFINES += QQNXGLBACKINGSTORE_DEBUG
 #DEFINES += QQNXGLCONTEXT_DEBUG
 #DEFINES += QQNXINPUTCONTEXT_DEBUG
@@ -24,65 +36,94 @@ QT += opengl opengl-private platformsupport platformsupport-private widgets-priv
 #DEFINES += QQNXSCREENEVENT_DEBUG
 #DEFINES += QQNXVIRTUALKEYBOARD_DEBUG
 #DEFINES += QQNXWINDOW_DEBUG
+#DEFINES += QQNXNAVIGATOR_DEBUG
 
 SOURCES =   main.cpp \
             qqnxbuffer.cpp \
-            qqnxeventthread.cpp \
-            qqnxglcontext.cpp \
-            qqnxglbackingstore.cpp \
+            qqnxscreeneventthread.cpp \
             qqnxintegration.cpp \
-            qqnxnavigatoreventhandler.cpp \
-            qqnxnavigatoreventnotifier.cpp \
             qqnxscreen.cpp \
             qqnxwindow.cpp \
             qqnxrasterbackingstore.cpp \
-            qqnxvirtualkeyboard.cpp \
-            qqnxclipboard.cpp \
             qqnxrootwindow.cpp \
             qqnxscreeneventhandler.cpp \
+            qqnxnativeinterface.cpp \
+            qqnxnavigatoreventhandler.cpp \
+            qqnxabstractnavigator.cpp \
             qqnxabstractvirtualkeyboard.cpp \
-            qqnxnativeinterface.cpp
+            qqnxservices.cpp
 
-HEADERS =   qqnxbuffer.h \
-            qqnxeventthread.h \
+HEADERS =   main.h \
+            qqnxbuffer.h \
+            qqnxscreeneventthread.h \
             qqnxkeytranslator.h \
             qqnxintegration.h \
-            qqnxnavigatoreventhandler.h \
-            qqnxnavigatoreventnotifier.h \
-            qqnxglcontext.h \
-            qqnxglbackingstore.h \
             qqnxscreen.h \
             qqnxwindow.h \
             qqnxrasterbackingstore.h \
-            qqnxvirtualkeyboard.h \
-            qqnxclipboard.h \
             qqnxrootwindow.h \
             qqnxscreeneventhandler.h \
+            qqnxnativeinterface.h \
+            qqnxnavigatoreventhandler.h \
+            qqnxabstractnavigator.h \
             qqnxabstractvirtualkeyboard.h \
-            qqnxnativeinterface.h
+            qqnxservices.h
 
-CONFIG(blackberry) {
-    SOURCES += qqnxservices.cpp
-    HEADERS += qqnxservices.h
-}
+LIBS += -lscreen
 
-CONFIG(qqnx_imf) {
-    DEFINES += QQNX_IMF
-    HEADERS += qqnxinputcontext_imf.h
-    SOURCES += qqnxinputcontext_imf.cpp
-} else {
-    HEADERS += qqnxinputcontext_noimf.h
-    SOURCES += qqnxinputcontext_noimf.cpp
-}
+contains(QT_CONFIG, opengles2) {
+    SOURCES += qqnxglcontext.cpp \
+               qqnxglbackingstore.cpp
 
-QMAKE_CXXFLAGS += -I./private
+    HEADERS += qqnxglcontext.h \
+               qqnxglbackingstore.h
 
-LIBS += -lpps -lscreen -lEGL -lclipboard
+    LIBS += -lEGL
+}
 
 CONFIG(blackberry) {
+    SOURCES += qqnxnavigatorbps.cpp \
+               qqnxeventdispatcher_blackberry.cpp \
+               qqnxbpseventfilter.cpp \
+               qqnxvirtualkeyboardbps.cpp
+
+    HEADERS += qqnxnavigatorbps.h \
+               qqnxeventdispatcher_blackberry.h \
+               qqnxbpseventfilter.h \
+               qqnxvirtualkeyboardbps.h
+
     LIBS += -lbps
 }
 
+CONFIG(qqnx_pps) {
+    DEFINES += QQNX_PPS
+
+    SOURCES += qqnxnavigatorpps.cpp \
+               qqnxnavigatoreventnotifier.cpp \
+               qqnxvirtualkeyboardpps.cpp \
+               qqnxclipboard.cpp
+
+    HEADERS += qqnxnavigatorpps.h \
+               qqnxnavigatoreventnotifier.h \
+               qqnxvirtualkeyboardpps.h \
+               qqnxclipboard.h
+
+    LIBS += -lpps -lclipboard
+
+    CONFIG(qqnx_imf) {
+        DEFINES += QQNX_IMF
+        HEADERS += qqnxinputcontext_imf.h
+        SOURCES += qqnxinputcontext_imf.cpp
+    } else {
+        HEADERS += qqnxinputcontext_noimf.h
+        SOURCES += qqnxinputcontext_noimf.cpp
+    }
+}
+
+OTHER_FILES += qnx.json
+
+QMAKE_CXXFLAGS += -I./private
+
 include (../../../platformsupport/eglconvenience/eglconvenience.pri)
 include (../../../platformsupport/fontdatabases/fontdatabases.pri)