summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2017-09-24 17:17:27 (GMT)
committerTobias Markmann <tm@ayena.de>2017-09-24 17:17:27 (GMT)
commit7c6ebccaea10689d791c1c2f2488fcd60a44db0c (patch)
tree8b3ed8fb966b522e8420a16e254055be9bb5c254
parent60486ab63efd9abceaf2f2cf30023d483b4c462f (diff)
downloadswift-7c6ebccaea10689d791c1c2f2488fcd60a44db0c.zip
swift-7c6ebccaea10689d791c1c2f2488fcd60a44db0c.tar.bz2
Fix 'Start chat...' dialog disappearing after adding participant
Qt deprecated Q_WS_* defines to detect the windowing system at compile time. Changed the code to use Q_OS_MAC to enable the workaround for macOS. Test-Information: Tested with Qt 5.4.2 and Qt 5.8.0 on macOS 10.12.6. Change-Id: I49953f084ad6003c08b02550741dc16ef5df21fe
-rw-r--r--Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
index 8c46e38..e55ee80 100644
--- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
+++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
@@ -205,7 +205,7 @@ void QtSuggestingJIDInput::hidePopup() {
// Give focus back to input widget because the hide() call passes the focus to the wrong widget.
setFocus();
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
// This workaround is needed on OS X, to bring the dialog containing this widget back to the front after
// the popup is hidden. Ubuntu 16.04 and Windows 8 do not have this issue.
window()->raise();