diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-05-08 15:51:30 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-05-14 19:08:11 +0200 |
| commit | 9292955f8ae16a6f4ca756aaca01def0bda82ef1 (patch) | |
| tree | 52f66460dc1149426e873218c5f77c9ead8e7f6d /src/libs/utils/appmainwindow.cpp | |
| parent | 116219f3700ac8565df7aafbd5a40ad784fca125 (diff) | |
Fix the main window raise workaround for Qt5.1
Change-Id: I17d09c70053661166784657954929ccf3b5366ec
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/libs/utils/appmainwindow.cpp')
| -rw-r--r-- | src/libs/utils/appmainwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/utils/appmainwindow.cpp b/src/libs/utils/appmainwindow.cpp index 4c337ba3026..df9abc26c55 100644 --- a/src/libs/utils/appmainwindow.cpp +++ b/src/libs/utils/appmainwindow.cpp @@ -36,7 +36,7 @@ #include <QEvent> #include <QCoreApplication> -#ifdef Q_WS_X11 +#ifdef QTC_USE_QX11INFO #include <X11/Xlib.h> #include <QX11Info> #endif @@ -63,7 +63,7 @@ void AppMainWindow::raiseWindow() raise(); -#if defined(Q_WS_X11) +#if defined(QTC_USE_QX11INFO) // Do the same as QWidget::activateWindow(), but with two differences // * set newest timestamp (instead of userTime()). See QTBUG-24932 // * set source to 'pager'. This seems to do the trick e.g. on kwin even if @@ -79,7 +79,7 @@ void AppMainWindow::raiseWindow() e.xclient.data.l[2] = None; e.xclient.data.l[3] = 0; e.xclient.data.l[4] = 0; - XSendEvent(QX11Info::display(), QX11Info::appRootWindow(x11Info().screen()), + XSendEvent(QX11Info::display(), QX11Info::appRootWindow(), false, SubstructureNotifyMask | SubstructureRedirectMask, &e); #else activateWindow(); |