diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 19:46:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 19:46:59 (GMT) |
| commit | e99a9e6b8ef0521e46742fe876766a6021f0121d (patch) | |
| tree | 96a81faa8e17b625e18e1ef94c51d3efbfd16787 /src/gui/egl | |
| parent | 186f75db32bdc177bdbc192552cf7275d9723c85 (diff) | |
| parent | 930c6554022cd30149912c92e88a7884609b44ba (diff) | |
| download | Qt-e99a9e6b8ef0521e46742fe876766a6021f0121d.zip Qt-e99a9e6b8ef0521e46742fe876766a6021f0121d.tar.gz Qt-e99a9e6b8ef0521e46742fe876766a6021f0121d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix build with Mesa 7.8's EGL implementatioon
Reset the byte order in the iconv codec after using it.
fix "using namespace" recursion crash
Fixed key mappings on X11
QDom: prevent infinite loop when cloning a DTD
QPrintPreviewDialog number of pages is partially blocked from view in OSX
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( f3110d2f94c825477afac054ed448e45d47f5670 )
Diffstat (limited to 'src/gui/egl')
| -rw-r--r-- | src/gui/egl/qeglproperties.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/egl/qeglproperties.cpp b/src/gui/egl/qeglproperties.cpp index 236ec37..d0d5de7 100644 --- a/src/gui/egl/qeglproperties.cpp +++ b/src/gui/egl/qeglproperties.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ +#include <QtCore/qdebug.h> +#include <QtCore/qstringlist.h> + #include "qeglproperties_p.h" QT_BEGIN_NAMESPACE -#include <QtCore/qdebug.h> -#include <QtCore/qstringlist.h> - #include "qegl_p.h" |