diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2010-03-30 11:28:02 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2010-03-30 11:28:02 (GMT) |
| commit | 753ce0f7a2f16dd0303f6ad5493e9ce6bfc13fd7 (patch) | |
| tree | fc1467525883912cc603174cbb55174d9201e4da /src/gui/kernel/qt_x11_p.h | |
| parent | 9181ba917aa4f842e5c3e8febebe363f4dc11c6f (diff) | |
| parent | 3ac354b885dcaf7186cf8bafdfc2bdc0c6d8dbd0 (diff) | |
| download | Qt-753ce0f7a2f16dd0303f6ad5493e9ce6bfc13fd7.zip Qt-753ce0f7a2f16dd0303f6ad5493e9ce6bfc13fd7.tar.gz Qt-753ce0f7a2f16dd0303f6ad5493e9ce6bfc13fd7.tar.bz2 | |
Merge remote branch 'qt/4.7' into 4.7
Conflicts:
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
Diffstat (limited to 'src/gui/kernel/qt_x11_p.h')
| -rw-r--r-- | src/gui/kernel/qt_x11_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h index e1b2625..7383382 100644 --- a/src/gui/kernel/qt_x11_p.h +++ b/src/gui/kernel/qt_x11_p.h @@ -632,6 +632,8 @@ struct QX11Data _NET_SYSTEM_TRAY_VISUAL, + _NET_ACTIVE_WINDOW, + // Property formats COMPOUND_TEXT, TEXT, |