summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-03-17 13:16:25 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-03-18 08:31:45 (GMT)
commit7343939f58d6ee3c695ad0a62248fda04f58e1a2 (patch)
tree48f96732846a4dd973413f466aa307d74f6eb78f /tools/configure
parente483886bcfcf7252af9ac7cc89de15f912bf69da (diff)
downloadQt-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 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 2555015..b35f454 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -969,6 +969,10 @@ void Configure::parseCmdLine()
if(i==argCount)
break;
dictionary[ "QT_LIBINFIX" ] = configCmdLine.at(i);
+ if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
+ dictionary[ "QT_INSTALL_PLUGINS" ] =
+ QString("\\resource\\qt%1\\plugins").arg(dictionary[ "QT_LIBINFIX" ]);
+ }
} else if( configCmdLine.at(i) == "-D" ) {
++i;
if (i==argCount)
@@ -3023,6 +3027,8 @@ void Configure::generateConfigfiles()
qconfigList += "QT_NO_CRASHHANDLER";
qconfigList += "QT_NO_PRINTER";
qconfigList += "QT_NO_SYSTEMTRAYICON";
+ if (dictionary.contains("QT_LIBINFIX"))
+ tmpStream << QString("#define QT_LIBINFIX \"%1\"").arg(dictionary["QT_LIBINFIX"]) << endl;
}
qconfigList.sort();