diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-09 21:23:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-09 21:23:03 (GMT) |
| commit | 213b5d2651aaf55e76b3aab3788ab86a08a75b82 (patch) | |
| tree | b6103525329ee34c80e1a68063726bd8f12766f1 /src/corelib | |
| parent | 3817f59657147c6341dea54d220e5bfa704f24de (diff) | |
| parent | 97305f4ca91b380f42ff5d3fd49c268df0c5ff8c (diff) | |
| download | Qt-213b5d2651aaf55e76b3aab3788ab86a08a75b82.zip Qt-213b5d2651aaf55e76b3aab3788ab86a08a75b82.tar.gz Qt-213b5d2651aaf55e76b3aab3788ab86a08a75b82.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
4.7.2 changes
Change paging attributes for Symbian binaries
Fix build failure
Fix regression in creating mkspecs/default
Changes for 4.7.2
Recreate Symbian raster backing store when WA_TranslucentBackground set
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/corelib.pro | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index a001940..06aa191 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -33,7 +33,10 @@ contains(DEFINES,QT_EVAL):include(eval.pri) symbian: { TARGET.UID3=0x2001B2DC - # Workaroud for problems with paging this dll - MMP_RULES -= PAGED - MMP_RULES *= UNPAGED + # Problems using data exports from this DLL mean that we can't page it on releases that don't support + # data exports (currently that's any release before Symbian^3) + pagingBlock = "$${LITERAL_HASH}ifndef SYMBIAN_DLL_DATA_EXPORTS_SUPPORTED" \ + "UNPAGED" \ + "$${LITERAL_HASH}endif" + MMP_RULES += pagingBlock } |