diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-05 11:04:24 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-05 11:04:24 (GMT) |
| commit | 4d33c51bf00be826b8036f58cd9aea0c1f44f8ce (patch) | |
| tree | 99339183e160058b996580157d8ed89bd6809562 /mkspecs/features | |
| parent | badcaa75b4a5e5dfbb85f5abf856abcfcfa20533 (diff) | |
| parent | b0e6c5ca48c76fb17dca986e9e07adebde390e29 (diff) | |
| download | Qt-4d33c51bf00be826b8036f58cd9aea0c1f44f8ce.zip Qt-4d33c51bf00be826b8036f58cd9aea0c1f44f8ce.tar.gz Qt-4d33c51bf00be826b8036f58cd9aea0c1f44f8ce.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/corelib/io/qdatastream.h
tools/assistant/translations/translations_adp.pro
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
tools/qdoc3/test/qt.qdocconf
translations/assistant_adp_de.ts
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/symbian/qt.prf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf index 3b24355..0f5b08b 100644 --- a/mkspecs/features/symbian/qt.prf +++ b/mkspecs/features/symbian/qt.prf @@ -21,13 +21,13 @@ load(qt) # INCLUDEPATH = $$PREPEND_INCLUDEPATH $$INCLUDEPATH -# Add dependency to QtLibs package to all other projects besides QtLibs. -# Note: QtLibs with full capabilities has UID3 of 0x2001E61C, -# while self-signed version typically has temporary UID3 of 0xE001E61C. +# Add dependency to Qt package to all other projects besides Qt libs. +# Note: Qt libs with full capabilities has UID3 of 0x2001E61C, +# while self-signed version typically has temporary UID3 of 0xE001E61C. contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C) { default_deployment.pkg_prerules += \ "; Default dependency to Qt libraries" \ - "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"QtLibs pre-release\"}" + "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"Qt\"}" } isEmpty(TARGET.EPOCSTACKSIZE):TARGET.EPOCSTACKSIZE = 0x14000 |