diff options
author | Nick Shaforostoff <shaforostoff@gmail.com> | 2016-04-13 00:47:50 +0300 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-08-26 07:39:53 +0000 |
commit | 8adad2fe09b173ff876895c27884f49804a20bcc (patch) | |
tree | 97cc19e256e08e8c958cb1b60860e153a8f18685 /src/plugins/platforminputcontexts/ibus | |
parent | 15c39dfe3db5c4264b49cb53e80ec088ea4948e9 (diff) |
fix build with various QT_NO_* defines
Done-with: Andriy Gerasika <andriy.gerasika@gmail.com>
Change-Id: I90883a491dbddb005c3d756c339e42285d50e437
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/platforminputcontexts/ibus')
-rw-r--r-- | src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp | 6 | ||||
-rw-r--r-- | src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp index 994fe8386b..736c66ebc0 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp @@ -101,11 +101,13 @@ QIBusPlatformInputContext::QIBusPlatformInputContext () QString socketPath = QIBusPlatformInputContextPrivate::getSocketPath(); QFile file(socketPath); if (file.open(QFile::ReadOnly)) { +#ifndef QT_NO_FILESYSTEMWATCHER // If KDE session save is used or restart ibus-daemon, // the applications could run before ibus-daemon runs. // We watch the getSocketPath() to get the launching ibus-daemon. m_socketWatcher.addPath(socketPath); connect(&m_socketWatcher, SIGNAL(fileChanged(QString)), this, SLOT(socketChanged(QString))); +#endif } m_timer.setSingleShot(true); @@ -408,8 +410,10 @@ void QIBusPlatformInputContext::filterEventFinished(QDBusPendingCallWatcher *cal && window != NULL) { const QPoint globalPos = window->screen()->handle()->cursor()->pos(); const QPoint pos = window->mapFromGlobal(globalPos); +#ifndef QT_NO_CONTEXTMENU QWindowSystemInterface::handleContextMenuEvent(window, false, pos, globalPos, modifiers); +#endif } #endif // QT_NO_CONTEXTMENU QWindowSystemInterface::handleExtendedKeyEvent(window, time, type, qtcode, modifiers, @@ -449,8 +453,10 @@ void QIBusPlatformInputContext::connectToBus() d->initBus(); connectToContextSignals(); +#ifndef QT_NO_FILESYSTEMWATCHER if (m_socketWatcher.files().size() == 0) m_socketWatcher.addPath(QIBusPlatformInputContextPrivate::getSocketPath()); +#endif } void QIBusPlatformInputContext::globalEngineChanged(const QString &engine_name) diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h index 4f2722480e..94fa5c3d60 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h @@ -110,7 +110,9 @@ public Q_SLOTS: private: QIBusPlatformInputContextPrivate *d; bool m_eventFilterUseSynchronousMode; +#ifndef QT_NO_FILESYSTEMWATCHER QFileSystemWatcher m_socketWatcher; +#endif QTimer m_timer; void connectToContextSignals(); |