diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-05-21 15:19:43 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-05-21 15:19:43 (GMT) |
| commit | 1e3ca798b54dbf99436fd47748b004ec1d176e29 (patch) | |
| tree | 93cdadfe83ce13fddbfcb05396c1346393794d9f /mkspecs/features | |
| parent | 24b811e53b30546279346ab7b16799be119ab8c4 (diff) | |
| parent | be04377b22475772e376a51017855a00cc732e80 (diff) | |
| download | Qt-1e3ca798b54dbf99436fd47748b004ec1d176e29.zip Qt-1e3ca798b54dbf99436fd47748b004ec1d176e29.tar.gz Qt-1e3ca798b54dbf99436fd47748b004ec1d176e29.tar.bz2 | |
Merge commit 'origin/4.7' into symbian47
Conflicts:
src/corelib/global/qglobal.h
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/default_pre.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/qt.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/resources.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/symbian/qt.prf | 9 | ||||
| -rw-r--r-- | mkspecs/features/uic.prf | 1 |
5 files changed, 14 insertions, 1 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 6442594..2e82f03 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -1,2 +1,3 @@ load(exclusive_builds) +### Qt 5: remove "uic" and "resources" - or add "qt" CONFIG = lex yacc warn_on debug uic resources $$CONFIG diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 62cce62..e8946de 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -31,6 +31,9 @@ plugin { #Qt plugins } } +#handle modules +for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod) + #handle includes INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf index 5d00a4d..a305a4f 100644 --- a/mkspecs/features/resources.prf +++ b/mkspecs/features/resources.prf @@ -1,3 +1,4 @@ +defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf qtPrepareTool(QMAKE_RCC, rcc) isEmpty(RCC_DIR):RCC_DIR = . diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf index 9fc9814..b5d3d98 100644 --- a/mkspecs/features/symbian/qt.prf +++ b/mkspecs/features/symbian/qt.prf @@ -31,9 +31,16 @@ contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0 # Projects linking to webkit need dependency to webkit contains(QT, webkit): { + # these can be overridden by mkspecs/modules/qt_webkit.pri + isEmpty(QT_WEBKIT_MAJOR_VERSION) { + QT_WEBKIT_MAJOR_VERSION = $${QT_MAJOR_VERSION} + QT_WEBKIT_MINOR_VERSION = $${QT_MINOR_VERSION} + QT_WEBKIT_PATCH_VERSION = $${QT_PATCH_VERSION} + } + pkg_depends_webkit += \ "; Dependency to Qt Webkit" \ - "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"QtWebKit\"}" + "(0x200267C2), $${QT_WEBKIT_MAJOR_VERSION}, $${QT_WEBKIT_MINOR_VERSION}, $${QT_WEBKIT_PATCH_VERSION}, {\"QtWebKit\"}" } else { default_deployment.pkg_prerules -= pkg_depends_webkit } diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index d108f24..c87372d 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -1,3 +1,4 @@ +defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf qtPrepareTool(QMAKE_UIC3, uic3) qtPrepareTool(QMAKE_UIC, uic) |