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>
This commit is contained in:
Samuel Rødal 2011-08-10 14:14:22 +02:00 committed by Matthew Cattell
parent ac26ac4650
commit 73769d85ec
2 changed files with 5 additions and 1 deletions

View File

@ -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 &parameters)
m_fontDatabase = new QGenericUnixFontDatabase();
m_nativeInterface = new QXcbNativeInterface;
#if defined(XCB_USE_IBUS)
m_inputContext = new QIBusPlatformInputContext;
#else
m_inputContext = 0;
#endif
}
QXcbIntegration::~QXcbIntegration()

View File

@ -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
}