diff --git a/src/libs/utils/appmainwindow.cpp b/src/libs/utils/appmainwindow.cpp index 51c7848abdd..155a33ab1eb 100644 --- a/src/libs/utils/appmainwindow.cpp +++ b/src/libs/utils/appmainwindow.cpp @@ -37,11 +37,6 @@ #include #include -#ifdef QTC_USE_QX11INFO -#include -#include -#endif - namespace Utils { /* The notification signal is delayed by using a custom event @@ -64,27 +59,7 @@ void AppMainWindow::raiseWindow() raise(); -#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 - // the app currently having focus is 'active' (but we hit a breakpoint). - XEvent e; - e.xclient.type = ClientMessage; - e.xclient.message_type = XInternAtom(QX11Info::display(), "_NET_ACTIVE_WINDOW", 1); - e.xclient.display = QX11Info::display(); - e.xclient.window = winId(); - e.xclient.format = 32; - e.xclient.data.l[0] = 2; // pager! - e.xclient.data.l[1] = QX11Info::appTime(); // X11 time! - e.xclient.data.l[2] = None; - e.xclient.data.l[3] = 0; - e.xclient.data.l[4] = 0; - XSendEvent(QX11Info::display(), QX11Info::appRootWindow(), - false, SubstructureNotifyMask | SubstructureRedirectMask, &e); -#else activateWindow(); -#endif } #ifdef Q_OS_WIN diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro index b857dc9b24d..2016bcbd4b1 100644 --- a/src/libs/utils/utils.pro +++ b/src/libs/utils/utils.pro @@ -3,17 +3,6 @@ QT += gui network include(../../qtcreatorlibrary.pri) include(utils-lib.pri) -linux-* { - !isEmpty(QT.x11extras.name) { - QT += x11extras - CONFIG += x11 - DEFINES += QTC_USE_QX11INFO - } else { - warning("x11extras module not found, raising the main window might not work. " \ - "(The x11extras module is part of Qt 5.1 and later.)") - } -} - win32: LIBS += -luser32 -lshell32 # PortsGatherer win32: LIBS += -liphlpapi -lws2_32