Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds.

Task-number: QTBUG-10432
Rubber-stamped-by: ossi
Reviewed-by: TrustMe

3 files changed, 16 insertions, 4 deletions

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index b19eece..61a6228 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -302,3 +302,10 @@ defineReplace(addLanguageDependentPkgItem) {
 
     return($$join(pkgLanguageList,",",,))
 }
+
+# Sometimes a relative path to original .pro file directory is necessary when doing shadow builds.
+defineReplace(relativeProPath) {
+    RELATIVE_PRO_FILE_PWD = $$replace(OUT_PWD, "^.:", "")  # Lose drive letter if any
+    RELATIVE_PRO_FILE_PWD = $$replace(RELATIVE_PRO_FILE_PWD, "/[^/]*", "../")$$replace(_PRO_FILE_PWD_, "^[^/]*/", "")
+    return($$RELATIVE_PRO_FILE_PWD)
+}
diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
index 0d233e6..382217a 100644
--- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
+++ b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
@@ -4,6 +4,8 @@ TEMPLATE = subdirs
 # We just want to export the sqlite3 binaries for Symbian for platforms that do not have them.
 symbian-abld|symbian-sbsv2 {
     !symbian_no_export_sqlite:!exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso) {
-        BLD_INF_RULES.prj_exports +=  ":zip SQLite3_v9.2.zip"
+        # Symbian exports do not like drive letter, so remove it from the source dir
+        SQLITE_SRC_DIR = $$relativeProPath()
+        BLD_INF_RULES.prj_exports +=  ":zip $$SQLITE_SRC_DIR/SQLite3_v9.2.zip"
     }
 }
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index a43c3df..c2b462c 100755
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -27,13 +27,16 @@ symbian: {
         $$QMAKE_LIBDIR_QT/QtTest$${QT_LIBINFIX}.dll \
         $$QMAKE_LIBDIR_QT/QtSql$${QT_LIBINFIX}.dll
 
+    # Symbian exports do not like absolute paths, so generate a relative path to original .pro file dir
+    S60_INSTALLS_SOURCE_DIR = $$relativeProPath()
+
     symbian-abld|symbian-sbsv2 {
         pluginLocations = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)
         bearerPluginLocation = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)
         bearerStubZ = $${EPOCROOT}$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin
         BLD_INF_RULES.prj_exports += \
-            "qsymbianbearer.qtplugin /$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" \
-            "qsymbianbearer.qtplugin /epoc32/winscw/c$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin"
+            "$$S60_INSTALLS_SOURCE_DIR/qsymbianbearer.qtplugin /$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" \
+            "$$S60_INSTALLS_SOURCE_DIR/qsymbianbearer.qtplugin /epoc32/winscw/c$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin"
     } else {
         pluginLocations = $$QT_BUILD_TREE/plugins/s60
         bearerPluginLocation = $$QT_BUILD_TREE/plugins/bearer
@@ -171,5 +174,5 @@ symbian: {
         qtlibraries.files += $$QMAKE_LIBDIR_QT/QtMultimedia$${QT_LIBINFIX}.dll
     }
 
-    BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
+    BLD_INF_RULES.prj_exports += "$$S60_INSTALLS_SOURCE_DIR/qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
 }