diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-10 14:14:22 +0200 |
|---|---|---|
| committer | Matthew Cattell <matthew.cattell@nokia.com> | 2011-08-10 14:31:13 +0200 |
| commit | 73769d85ec13ed6b57f1eccd3618616fd03d7cb7 (patch) | |
| tree | f40255402d7f06420ab7fa9ef6c6abe33a0a371e /src | |
| parent | ac26ac46504fb8ff0bfc4b09c39067cb3ef9f4d6 (diff) | |
Don't try to use IBUS when dbus is not configured.
Change-Id: I315ef3d834e923b649e4306866666549852c254f
Reviewed-on: http://codereview.qt.nokia.com/2825
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/xcb.pro | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 7982f8dc0e..3053cba81e 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -64,7 +64,6 @@ #include <EGL/egl.h> #endif -#define XCB_USE_IBUS #if defined(XCB_USE_IBUS) #include "QtPlatformSupport/qibusplatforminputcontext.h" #endif @@ -100,7 +99,11 @@ QXcbIntegration::QXcbIntegration(const QStringList ¶meters) m_fontDatabase = new QGenericUnixFontDatabase(); m_nativeInterface = new QXcbNativeInterface; +#if defined(XCB_USE_IBUS) m_inputContext = new QIBusPlatformInputContext; +#else + m_inputContext = 0; +#endif } QXcbIntegration::~QXcbIntegration() diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro index ff0ad6d152..cf03f8ba91 100644 --- a/src/plugins/platforms/xcb/xcb.pro +++ b/src/plugins/platforms/xcb/xcb.pro @@ -85,6 +85,7 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB CONFIG += qpa/genericunixfontdatabase contains(QT_CONFIG, dbus) { +DEFINES += XCB_USE_IBUS QT += dbus LIBS += -ldbus-1 } |