diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-31 01:46:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-31 01:46:11 (GMT) |
| commit | 1e48d40597bbe12321a5a3e42b3595dc17a7f8e7 (patch) | |
| tree | 16bc5824f55124f1be742cc5c3f55f94e223fee1 /src/plugins/platforms | |
| parent | c57195dc899ca732083487ed069ef813c340c0b5 (diff) | |
| parent | e95de30977291a251660f72baa84b5ff244711fb (diff) | |
| download | Qt-1e48d40597bbe12321a5a3e42b3595dc17a7f8e7.zip Qt-1e48d40597bbe12321a5a3e42b3595dc17a7f8e7.tar.gz Qt-1e48d40597bbe12321a5a3e42b3595dc17a7f8e7.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:
don't crash when destroying the shortcuts
Disable activeqt on win32-g++ (it doesn't build).
fix warning
remove unused functions
Make the DBus timeout configurable in QDBusAbstractInterface.
Fix a typo in qt-conf docs.
Revert "Fix build with the Clang compiler"
Added missing no_include_pwd check
Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'
Fix build with the Clang compiler
Change spacing of title in offline style.
Add support for rawFonts loaded from data in FaceId
examples: fix compilation with namespaced Qt.
Russian translation update
Update Japanese translations for Qt 4.8.
directfb: Include directfbgl.h directly
tests: fix QNetworkProxyFactory test
don't detach until the list is going to be modified
optimize QList::removeAll()
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/directfb/qdirectfbglcontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/directfb/qdirectfbglcontext.cpp b/src/plugins/platforms/directfb/qdirectfbglcontext.cpp index 8a40b24..aca28f1 100644 --- a/src/plugins/platforms/directfb/qdirectfbglcontext.cpp +++ b/src/plugins/platforms/directfb/qdirectfbglcontext.cpp @@ -41,7 +41,7 @@ #include "qdirectfbglcontext.h" -#include <directfb/directfbgl.h> +#include <directfbgl.h> #include <QDebug> |