diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-19 08:02:40 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-19 08:02:40 (GMT) |
| commit | 530fd3831f012337d7460c4387ce82083ab3e144 (patch) | |
| tree | 5982ace32770fe05e5357b28099f3971f454b69f /mkspecs | |
| parent | 630114a8c65e492b7b9008e056895302865ba528 (diff) | |
| parent | 3cb3c9a7922cd96744ff0e15790103dbb68b3bf9 (diff) | |
| download | Qt-530fd3831f012337d7460c4387ce82083ab3e144.zip Qt-530fd3831f012337d7460c4387ce82083ab3e144.tar.gz Qt-530fd3831f012337d7460c4387ce82083ab3e144.tar.bz2 | |
Merge branch '4.6' of ../qt into kinetic-declarativeui
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/symbian/platform_paths.prf | 2 | ||||
| -rw-r--r-- | mkspecs/linux-g++-maemo/qmake.conf | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/features/symbian/platform_paths.prf b/mkspecs/features/symbian/platform_paths.prf index f5caae0..c723d8c 100644 --- a/mkspecs/features/symbian/platform_paths.prf +++ b/mkspecs/features/symbian/platform_paths.prf @@ -59,7 +59,7 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) { # No platform specific paths provided, use default paths - exists($${EPOCROOT}epoc32/include/platform) { # New SF structure + exists($${EPOCROOT}epoc32/include/mw) { # New SF structure # --------------------------------------- # Location, where the applications layer specific public headers are exported diff --git a/mkspecs/linux-g++-maemo/qmake.conf b/mkspecs/linux-g++-maemo/qmake.conf index b0f3ca3..38c26a6 100644 --- a/mkspecs/linux-g++-maemo/qmake.conf +++ b/mkspecs/linux-g++-maemo/qmake.conf @@ -29,5 +29,7 @@ QMAKE_CXXFLAGS_RELEASE += -g -fno-omit-frame-pointer -fno-optimize-sibling-call # Work round PowerVR SGX 1.3 driver bug with glScissor & FBOs: DEFINES += QT_GL_NO_SCISSOR_TEST +# Work round SGX 1.4 driver bug (text corrupted), modify glyph cache width: +DEFINES += QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 load(qt_config) |