diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-05 18:36:10 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-05 18:36:10 (GMT) |
| commit | dbc4a07327e0c306eb84a65ae7fa98bdb36c6ad0 (patch) | |
| tree | 21ea670935253bb7002a29bea308d0cf9fa78595 /mkspecs | |
| parent | 6abee18b8ab9899b909a15227fba8fbc4506fad8 (diff) | |
| parent | 4c486619517cea4012a157995bce197c817d83e5 (diff) | |
| download | Qt-dbc4a07327e0c306eb84a65ae7fa98bdb36c6ad0.zip Qt-dbc4a07327e0c306eb84a65ae7fa98bdb36c6ad0.tar.gz Qt-dbc4a07327e0c306eb84a65ae7fa98bdb36c6ad0.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/symbian/qt.prf | 7 | ||||
| -rw-r--r-- | mkspecs/linux-g++-maemo/qmake.conf | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf index 0f5b08b..99f5ece 100644 --- a/mkspecs/features/symbian/qt.prf +++ b/mkspecs/features/symbian/qt.prf @@ -28,6 +28,13 @@ contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0 default_deployment.pkg_prerules += \ "; Default dependency to Qt libraries" \ "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"Qt\"}" + + # Projects linking to webkit need dependency to webkit + contains(QT, webkit): { + default_deployment.pkg_prerules += \ + "; Dependency to Qt Webkit" \ + "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"QtWebKit\"}" + } } isEmpty(TARGET.EPOCSTACKSIZE):TARGET.EPOCSTACKSIZE = 0x14000 diff --git a/mkspecs/linux-g++-maemo/qmake.conf b/mkspecs/linux-g++-maemo/qmake.conf index c39ba2c..b0f3ca3 100644 --- a/mkspecs/linux-g++-maemo/qmake.conf +++ b/mkspecs/linux-g++-maemo/qmake.conf @@ -5,6 +5,7 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app CONFIG += qt warn_on release incremental link_prl +CONFIG += nostrip QT += core gui QMAKE_INCREMENTAL_STYLE = sublib |