diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-05 16:06:46 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-05 16:06:46 +1000 |
| commit | a1640ce50e9350df64fca984a3454a72e31f0ef7 (patch) | |
| tree | 80c369d115452d794480734bde2150934bf07602 /demos | |
| parent | 91814c0a9d32b5a306037a73c067c02d3f5be4ff (diff) | |
| parent | 235e4fb7316cfe65605c3a035cf3a4f0d167335c (diff) | |
| download | qt4-tools-a1640ce50e9350df64fca984a3454a72e31f0ef7.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Correct client rect calculation for MCL
Symbian: Fix CBA display on application with multiple windows
Fix def files
doc - document symbian behaviour of QFile::link
Symbian - prefer sessions started by this process to choose proxy
Freezing Def files in Qt
Lightmaps demo Symbian fix
CBA comes on top of option menu
Fix memory leaks in OpenVG and OpenGL resource pools
Fix sqlite driver memory eating due to close failure
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/embedded/lightmaps/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/embedded/lightmaps/main.cpp b/demos/embedded/lightmaps/main.cpp index 85f74e638e..f9b6fb0210 100644 --- a/demos/embedded/lightmaps/main.cpp +++ b/demos/embedded/lightmaps/main.cpp @@ -44,7 +44,7 @@ int main(int argc, char **argv) { -#if defined(Q_WS_X11) +#if defined(Q_WS_X11) || defined(Q_OS_SYMBIAN) QApplication::setGraphicsSystem("raster"); #endif |