summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication_x11.cpp
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@nokia.com>2010-03-24 09:20:24 (GMT)
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2010-03-24 09:20:24 (GMT)
commit555175f9d9e5633b8fcfd6e6f6a11c84faa9946e (patch)
treea0be0a104e3cccf1822fda457dc47cfbef275fcf /src/gui/kernel/qapplication_x11.cpp
parente6bb8a4971b5d48190f9b8e6105926fcd1c47bda (diff)
downloadQt-555175f9d9e5633b8fcfd6e6f6a11c84faa9946e.zip
Qt-555175f9d9e5633b8fcfd6e6f6a11c84faa9946e.tar.gz
Qt-555175f9d9e5633b8fcfd6e6f6a11c84faa9946e.tar.bz2
Revert "Make QWidget::activateWindow() NET window manager aware."
This reverts commit 6390248b11b3596d8c946c232e9b0d832dc42941, which caused the following regressions: TESTFUNCTION_FAIL qshortcut::ambiguousItems (pulse_linux-g++) TESTFUNCTION_FAIL qshortcut::ambiguousRotation (pulse_linux-g++) TESTFUNCTION_FAIL qshortcut::disabledItems (pulse_linux-g++) TESTFUNCTION_FAIL qshortcut::keypressConsumption (pulse_linux-g++) TESTFUNCTION_FAIL qshortcut::number (pulse_linux-g++) TESTFUNCTION_FAIL qshortcut::text (pulse_linux-g++) TESTFUNCTION_FAIL qshortcut::unicodeCompare (pulse_linux-g++)
Diffstat (limited to 'src/gui/kernel/qapplication_x11.cpp')
-rw-r--r--src/gui/kernel/qapplication_x11.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 67e0865..ea44173 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -275,8 +275,6 @@ static const char * x11_atomnames = {
"_NET_SYSTEM_TRAY_VISUAL\0"
- "_NET_ACTIVE_WINDOW\0"
-
// Property formats
"COMPOUND_TEXT\0"
"TEXT\0"