diff options
| -rw-r--r-- | src/mumble/GlobalShortcut_unix.cpp | 4 | ||||
| -rw-r--r-- | src/mumble/GlobalShortcut_unix.h | 1 | ||||
| -rw-r--r-- | src/mumble/MainWindow.cpp | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/mumble/GlobalShortcut_unix.cpp b/src/mumble/GlobalShortcut_unix.cpp index e3eb3f303..d55fc3b37 100644 --- a/src/mumble/GlobalShortcut_unix.cpp +++ b/src/mumble/GlobalShortcut_unix.cpp @@ -108,6 +108,10 @@ GlobalShortcutX::~GlobalShortcutX() { wait(); } +bool GlobalShortcutX::canSuppress() { + return bXevie; +} + void GlobalShortcutX::run() { fd_set in_fds; XEvent evt; diff --git a/src/mumble/GlobalShortcut_unix.h b/src/mumble/GlobalShortcut_unix.h index 6bdedfb1f..f3fbae419 100644 --- a/src/mumble/GlobalShortcut_unix.h +++ b/src/mumble/GlobalShortcut_unix.h @@ -45,6 +45,7 @@ class GlobalShortcutX : public GlobalShortcutEngine { ~GlobalShortcutX(); void run(); QString buttonName(const QVariant &); + virtual bool canSuppress(); public slots: void inputReadyRead(int); void directoryChanged(const QString &); diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index 33738816f..2a26cfcd5 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -335,7 +335,11 @@ void MainWindow::on_qtvPlayers_doubleClicked(const QModelIndex &idx) { } void MainWindow::on_qteLog_customContextMenuRequested(const QPoint &mpos) { +#if QT_VERSION >= 0x040400 QMenu *menu = qteLog->createStandardContextMenu(mpos); +#else + QMenu *menu = qteLog->createStandardContextMenu(); +#endif menu->addSeparator(); menu->addAction(tr("Clear"), qteLog, SLOT(clear(void))); menu->exec(qteLog->mapToGlobal(mpos)); |