Merge master -> api_changes

Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.

Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827

1 files changed, 71 insertions, 0 deletions

diff --git a/src/plugins/platforms/blackberry/blackberry.pro b/src/plugins/platforms/blackberry/blackberry.pro
new file mode 100644
index 0000000000..94b9c5dbc8
--- /dev/null
+++ b/src/plugins/platforms/blackberry/blackberry.pro
@@ -0,0 +1,71 @@
+TARGET = blackberry
+include(../../qpluginbase.pri)
+
+QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
+QT += opengl opengl-private platformsupport platformsupport-private widgets-private
+
+# Uncomment this to build with support for IMF once it becomes available in the BBNDK
+#CONFIG += qbb_imf
+
+# Uncomment these to enable debugging output for various aspects of the plugin
+#DEFINES += QBBBUFFER_DEBUG
+#DEFINES += QBBCLIPBOARD_DEBUG
+#DEFINES += QBBEVENTTHREAD_DEBUG
+#DEFINES += QBBGLBACKINGSTORE_DEBUG
+#DEFINES += QBBGLCONTEXT_DEBUG
+#DEFINES += QBBINPUTCONTEXT_DEBUG
+#DEFINES += QBBINPUTCONTEXT_IMF_EVENT_DEBUG
+#DEFINES += QBBINTEGRATION_DEBUG
+#DEFINES += QBBNAVIGATORTHREAD_DEBUG
+#DEFINES += QBBRASTERBACKINGSTORE_DEBUG
+#DEFINES += QBBROOTWINDOW_DEBUG
+#DEFINES += QBBSCREEN_DEBUG
+#DEFINES += QBBVIRTUALKEYBOARD_DEBUG
+#DEFINES += QBBWINDOW_DEBUG
+
+SOURCES =   main.cpp \
+            qbbbuffer.cpp \
+            qbbeventthread.cpp \
+            qbbglcontext.cpp \
+            qbbglbackingstore.cpp \
+            qbbintegration.cpp \
+            qbbnavigatorthread.cpp \
+            qbbscreen.cpp \
+            qbbwindow.cpp \
+            qbbrasterbackingstore.cpp \
+            qbbvirtualkeyboard.cpp \
+            qbbclipboard.cpp \
+            qbbrootwindow.cpp
+
+HEADERS =   qbbbuffer.h \
+            qbbeventthread.h \
+            qbbkeytranslator.h \
+            qbbintegration.h \
+            qbbnavigatorthread.h \
+            qbbglcontext.h \
+            qbbglbackingstore.h \
+            qbbscreen.h \
+            qbbwindow.h \
+            qbbrasterbackingstore.h \
+            qbbvirtualkeyboard.h \
+            qbbclipboard.h \
+            qbbrootwindow.h
+
+CONFIG(qbb_imf) {
+    DEFINES += QBB_IMF
+    HEADERS += qbbinputcontext_imf.h
+    SOURCES += qbbinputcontext_imf.cpp
+} else {
+    HEADERS += qbbinputcontext_noimf.h
+    SOURCES += qbbinputcontext_noimf.cpp
+}
+
+QMAKE_CXXFLAGS += -I./private
+
+LIBS += -lpps -lscreen -lEGL -lclipboard
+
+include (../../../platformsupport/eglconvenience/eglconvenience.pri)
+include (../../../platformsupport/fontdatabases/fontdatabases.pri)
+
+target.path += $$[QT_INSTALL_PLUGINS]/platforms
+INSTALLS += target