summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Roquetto <rafael.roquetto@kdab.com>2012-02-01 15:54:08 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-02-03 14:25:17 (GMT)
commit71d5c2a261126e005af352f747f3730f1cb74606 (patch)
tree2c569124d0e2d46ff905d3f2421abaf13a341b89
parent21713e04160ee285c831fedd1f3c7b8ce0aba681 (diff)
downloadQt-71d5c2a261126e005af352f747f3730f1cb74606.zip
Qt-71d5c2a261126e005af352f747f3730f1cb74606.tar.gz
Qt-71d5c2a261126e005af352f747f3730f1cb74606.tar.bz2
Adds QT_NO_QWS_INPUTMETHODS to blackberry qcc mkspecs
This prevents QApplication from setting a dummy input context, overriding the one set by the BB QPA plugin. Change-Id: Ie18e06d091d5d8748f3f253b0092ac725639cde1 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
-rw-r--r--mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h2
-rw-r--r--mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h b/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h
index 3a91ba8..8ed9436 100644
--- a/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h
+++ b/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h
@@ -98,4 +98,6 @@ inline int getpagesize()
#define QT_QWS_TEMP_DIR QString::fromLatin1(qgetenv("TMP"))
+#define QT_NO_QWS_INPUTMETHODS
+
#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h b/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h
index 3a91ba8..8ed9436 100644
--- a/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h
+++ b/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h
@@ -98,4 +98,6 @@ inline int getpagesize()
#define QT_QWS_TEMP_DIR QString::fromLatin1(qgetenv("TMP"))
+#define QT_NO_QWS_INPUTMETHODS
+
#endif // QPLATFORMDEFS_H