diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-16 16:26:06 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-16 16:26:06 (GMT) |
| commit | af1fa7fe766980210d7363c1559197f34b10d834 (patch) | |
| tree | e2964649ca8469269950a265060b3d1e7e6026f6 /mkspecs/features | |
| parent | c5bfbe27f5bbdb1f3e76af8ca5e0f4df27875a06 (diff) | |
| parent | 1433a2c8682cb1c8f89ceaf97ad7a509ac686879 (diff) | |
| download | Qt-af1fa7fe766980210d7363c1559197f34b10d834.zip Qt-af1fa7fe766980210d7363c1559197f34b10d834.tar.gz Qt-af1fa7fe766980210d7363c1559197f34b10d834.tar.bz2 | |
Merge branch '4.6'
Conflicts:
translations/assistant_adp_pl.ts
translations/assistant_adp_ru.ts
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 12 | ||||
| -rw-r--r-- | mkspecs/features/uitools.prf | 4 |
3 files changed, 17 insertions, 4 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 2b2a42c..7f7d882 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -163,6 +163,11 @@ for(QTLIB, $$list($$lower($$unique(QT)))) { INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat/phonon INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon/Phonon + + # The Helix backend requires this. Since we can't let a plugin set it, + # we bump the values for all Symbian Phonon plugins. + symbian:isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x040000 0x1600000 + } else:isEqual(QTLIB, webkit):qlib = QtWebKit else:isEqual(QTLIB, multimedia):qlib = QtMultimedia else:message("Unknown QT: $$QTLIB"):qlib = diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 6322233..3f84f42 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -45,9 +45,15 @@ defineTest(qtAddLibrary) { } } } - symbian*:isEqual(LIB_NAME, QtGui) { - # Needed for #include <QtGui> because qs60mainapplication.h includes aknapp.h - INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE + symbian { + isEqual(LIB_NAME, QtGui) { + # Needed for #include <QtGui> because qs60mainapplication.h includes aknapp.h + INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE + } + isEqual(LIB_NAME, QtWebKit) { + # Needed for #include <QtXmlPatterns/QtXmlPatterns> because relative inclusion problem in toolchain + INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtXmlPatterns + } } isEmpty(LINKAGE) { if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { diff --git a/mkspecs/features/uitools.prf b/mkspecs/features/uitools.prf index 6eba066..2d14b04 100644 --- a/mkspecs/features/uitools.prf +++ b/mkspecs/features/uitools.prf @@ -2,7 +2,9 @@ QT += xml qt:load(qt) # Include the correct version of the UiLoader library -QTUITOOLS_LINKAGE = -lQtUiTools +symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib +else: QTUITOOLS_LINKAGE = -lQtUiTools + CONFIG(debug, debug|release) { mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug win32: QTUITOOLS_LINKAGE = -lQtUiToolsd |