diff options
author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2009-08-10 15:07:31 (GMT) |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2009-08-10 15:07:31 (GMT) |
commit | e67cd6560eea4e4b600d5e3586cd823347e101d2 (patch) | |
tree | 19e7a596b37c2da517b5d2d0dc0de4f7ee8f5b99 /src/gui/kernel/qt_x11_p.h | |
parent | 9a92aee8ff94a1b705e92f895831f9437762da75 (diff) | |
parent | cbd8a54f8c55e1982430fc929e9d74f977699428 (diff) | |
download | Qt-e67cd6560eea4e4b600d5e3586cd823347e101d2.zip Qt-e67cd6560eea4e4b600d5e3586cd823347e101d2.tar.gz Qt-e67cd6560eea4e4b600d5e3586cd823347e101d2.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/kernel/qapplication_win.cpp
Diffstat (limited to 'src/gui/kernel/qt_x11_p.h')
-rw-r--r-- | src/gui/kernel/qt_x11_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h index 1ac51e0..44652d3 100644 --- a/src/gui/kernel/qt_x11_p.h +++ b/src/gui/kernel/qt_x11_p.h @@ -515,7 +515,8 @@ struct QX11Data char *startupId; - DesktopEnvironment desktopEnvironment; + DesktopEnvironment desktopEnvironment : 8; + uint desktopVersion : 8; /* Used only for KDE */ /* Warning: if you modify this list, modify the names of atoms in qapplication_x11.cpp as well! */ enum X11Atom { |