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/symbian | |
| 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/symbian')
| -rw-r--r-- | mkspecs/features/symbian/qt.prf | 9 |
1 files changed, 8 insertions, 1 deletions
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 } |