summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Olszak <olszak.tomasz@gmail.com>2015-02-26 15:41:31 +0100
committerTomasz Olszak <olszak.tomasz@gmail.com>2015-02-26 15:41:31 +0100
commit5dba23fd8d2dd323dde9625265575618fbaa5238 (patch)
tree45b5dab15c5fa03937693c0d6e4e3445bdd79ee9
parente7ac60278494667fafcfedbc7b5611a470b76e5b (diff)
Revert "Tizen: always try to build ibus and compose."
This reverts commit 78a77290d53b8eb5a26d24a0f4f8f838b734b6f1. Change-Id: Ifab717e7e88cb24f83bd9bfd85987c243547d220
-rw-r--r--src/plugins/platforminputcontexts/platforminputcontexts.pro14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/platforminputcontexts/platforminputcontexts.pro b/src/plugins/platforminputcontexts/platforminputcontexts.pro
index a5ca4db7d2..54a4b21504 100644
--- a/src/plugins/platforminputcontexts/platforminputcontexts.pro
+++ b/src/plugins/platforminputcontexts/platforminputcontexts.pro
@@ -1,9 +1,11 @@
TEMPLATE = subdirs
-qtHaveModule(dbus) {
-!mac:!win32:SUBDIRS += ibus
-}
-
-contains(QT_CONFIG, xcb-plugin): SUBDIRS += compose
+!contains(DEFINES,Q_OS_LINUX_TIZEN_MOBILE): {
+ qtHaveModule(dbus) {
+ !mac:!win32:SUBDIRS += ibus
+ }
-contains(DEFINES,Q_OS_LINUX_TIZEN_MOBILE): SUBDIRS += tizenscim
+ contains(QT_CONFIG, xcb-plugin): SUBDIRS += compose
+} else {
+ SUBDIRS += tizenscim
+}