diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-03-17 13:16:25 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-03-18 08:31:45 (GMT) |
| commit | 7343939f58d6ee3c695ad0a62248fda04f58e1a2 (patch) | |
| tree | 48f96732846a4dd973413f466aa307d74f6eb78f /mkspecs/features | |
| parent | e483886bcfcf7252af9ac7cc89de15f912bf69da (diff) | |
| download | Qt-7343939f58d6ee3c695ad0a62248fda04f58e1a2.zip Qt-7343939f58d6ee3c695ad0a62248fda04f58e1a2.tar.gz Qt-7343939f58d6ee3c695ad0a62248fda04f58e1a2.tar.bz2 | |
Useful support for -qtlibinfix configure parameter in Symbian
Configure parameter -qtlibinfix will now change also plugin names
of plugins built and installed with Qt in Symbian.
Default plugin path is changed to: /resource/qt<libinfix>/plugins.
Other plugins besides the ones installed with Qt are not renamed.
With infixed configuration, Qt can be installed on a phone that already
has a Qt installed on ROM without interfering with the ROM version of
Qt.
Note that since s60main.rsc resource cannot deployed with infixed Qt,
and infixing it is somewhat problematic, currently the phone needs
to have proper Qt installation, too, for infixed Qt to work.
It also means that any changes to Qt that would affect s60main.rsc
cannot be tested on real device using infixed builds. Since this file
is unlikely to need changing, this should not be a big problem.
Task-number: QTBUG-9065
Reviewed-by: Jani Hautakangas
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/symbian/data_caging_paths.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/symbian/default_post.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/symbian/qt.prf | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/symbian/data_caging_paths.prf b/mkspecs/features/symbian/data_caging_paths.prf index 3ed5661..6f40bb5 100644 --- a/mkspecs/features/symbian/data_caging_paths.prf +++ b/mkspecs/features/symbian/data_caging_paths.prf @@ -74,7 +74,7 @@ exists($${EPOCROOT}epoc32/include/data_caging_paths.prf) { BOOTDATA_DIR = /resource/bootdata } -isEmpty(QT_PLUGINS_BASE_DIR): QT_PLUGINS_BASE_DIR = /$$RESOURCE_FILES_DIR/qt/plugins +isEmpty(QT_PLUGINS_BASE_DIR): QT_PLUGINS_BASE_DIR = /$$RESOURCE_FILES_DIR/qt$${QT_LIBINFIX}/plugins isEmpty(HW_ZDIR): HW_ZDIR = epoc32/data/z isEmpty(REG_RESOURCE_DIR): REG_RESOURCE_DIR = /private/10003a3f/apps isEmpty(REG_RESOURCE_IMPORT_DIR): REG_RESOURCE_IMPORT_DIR = /private/10003a3f/import/apps
\ No newline at end of file diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf index 7c9e8ee..0c952b5 100644 --- a/mkspecs/features/symbian/default_post.prf +++ b/mkspecs/features/symbian/default_post.prf @@ -5,7 +5,7 @@ contains(TEMPLATE, ".*app") { QMAKE_LIBS += } else:contains(QT, gui):contains(CONFIG,qt) { S60MAIN_LIBS = -leuser - QMAKE_LIBS += -lqtmain.lib $$S60MAIN_LIBS + QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib $$S60MAIN_LIBS } else { QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY } diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf index 99f5ece..275b86a 100644 --- a/mkspecs/features/symbian/qt.prf +++ b/mkspecs/features/symbian/qt.prf @@ -24,7 +24,7 @@ INCLUDEPATH = $$PREPEND_INCLUDEPATH $$INCLUDEPATH # 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) { +contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C):isEmpty(QT_LIBINFIX) { default_deployment.pkg_prerules += \ "; Default dependency to Qt libraries" \ "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"Qt\"}" |