diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 10:39:05 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 10:39:05 (GMT) |
commit | fa976feb9408ebaa12570997471f63683bdb88a2 (patch) | |
tree | 9c2519e7e859516f5e1aae8b8a4d9ac64ce2b10a /src/corelib/io/qurl.cpp | |
parent | a80130b07c5b8ee4b06eabbceb65eb23d4d4602e (diff) | |
parent | a45398677309ab905b69c599177b4c2951292b04 (diff) | |
download | Qt-fa976feb9408ebaa12570997471f63683bdb88a2.zip Qt-fa976feb9408ebaa12570997471f63683bdb88a2.tar.gz Qt-fa976feb9408ebaa12570997471f63683bdb88a2.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
X11: Keep the menubar inside the widgetbox window in toplevel mode
Retain ABI and API compatibility when Qt is built with EGL.
Diffstat (limited to 'src/corelib/io/qurl.cpp')
0 files changed, 0 insertions, 0 deletions