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

1 files changed, 18 insertions, 0 deletions

diff --git a/src/corelib/kernel/qcore_symbian_p.cpp b/src/corelib/kernel/qcore_symbian_p.cpp
index 0257ac4..a0a80c8 100644
--- a/src/corelib/kernel/qcore_symbian_p.cpp
+++ b/src/corelib/kernel/qcore_symbian_p.cpp
@@ -132,9 +132,27 @@ private:
     void init()
     {
 #ifdef Q_WS_S60
+#  if defined(QT_LIBINFIX)
+#    define S60_LIBNAME_3_1 "qts60plugin_3_1" QT_LIBINFIX ".dll"
+#    define S60_LIBNAME_3_2 "qts60plugin_3_2" QT_LIBINFIX ".dll"
+#    define S60_LIBNAME_5_0 "qts60plugin_5_0" QT_LIBINFIX ".dll"
+
+        TPtrC8 ptrLibName_3_1(reinterpret_cast<const TUint8 *>(S60_LIBNAME_3_1));
+        TPtrC8 ptrLibName_3_2(reinterpret_cast<const TUint8 *>(S60_LIBNAME_3_2));
+        TPtrC8 ptrLibName_5_0(reinterpret_cast<const TUint8 *>(S60_LIBNAME_5_0));
+
+        TFileName KLibName_3_1;
+        TFileName KLibName_3_2;
+        TFileName KLibName_5_0;
+
+        KLibName_3_1.Copy(ptrLibName_3_1);
+        KLibName_3_2.Copy(ptrLibName_3_2);
+        KLibName_5_0.Copy(ptrLibName_5_0);
+#  else
         _LIT(KLibName_3_1, "qts60plugin_3_1.dll");
         _LIT(KLibName_3_2, "qts60plugin_3_2.dll");
         _LIT(KLibName_5_0, "qts60plugin_5_0.dll");
+#  endif
         TPtrC libName;
         TInt uidValue;
         switch (QSysInfo::s60Version()) {