From 269ae27faccb81ba3aacd1723edad13885b991d4 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 26 May 2009 11:06:18 +0300
Subject: Fixed qlibrary autotest compilation error in symbian-abld

---
 tests/auto/qlibrary/lib2/lib2.pro | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/auto/qlibrary/lib2/lib2.pro b/tests/auto/qlibrary/lib2/lib2.pro
index 724077a..436d7ba 100644
--- a/tests/auto/qlibrary/lib2/lib2.pro
+++ b/tests/auto/qlibrary/lib2/lib2.pro
@@ -27,10 +27,11 @@ unix:!symbian: {
 
 symbian-abld: {
     TARGET.CAPABILITY=ALL -TCB
+    FIXEDROOT = $$replace(EPOCROOT,/,\\)
 	QMAKE_POST_LINK = \
-	copy /Y $${EPOCROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll  $${EPOCROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dl2 && \
-	copy /Y $${EPOCROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll  $${EPOCROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\system.trolltech.test.mylib.dll && \
-    IF NOT "$(PLATFORM)==WINSCW" copy /Y $${EPOCROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll  ..\tst\mylib.dl2
+    copy /Y $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll  $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dl2 && \
+    copy /Y $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll  $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\system.trolltech.test.mylib.dll && \
+    IF NOT "$(PLATFORM)==WINSCW" copy /Y $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll  ..\tst\mylib.dl2
 }
 
 symbian-sbsv2: {
-- 
cgit v0.12


From a83bc9473e340cce2ff84c614a1d6b42ced9dfa2 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 26 May 2009 11:26:39 +0300
Subject: Disabled building two versions of same library in qlibrary autotest
 for Symbian, as version tests are disabled in Symbian anyway.

---
 tests/auto/qlibrary/qlibrary.pro | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/auto/qlibrary/qlibrary.pro b/tests/auto/qlibrary/qlibrary.pro
index 9ba49ee..fd5790b 100644
--- a/tests/auto/qlibrary/qlibrary.pro
+++ b/tests/auto/qlibrary/qlibrary.pro
@@ -1,9 +1,16 @@
 QT -= gui
 TEMPLATE    =	subdirs
 CONFIG  += ordered
-SUBDIRS	=	lib \
-                lib2 \
-		tst
+
+symbian: {
+# Can't build two versions of lib with same name in symbian, so just build one
+SUBDIRS =   lib2 \
+            tst
+} else {
+SUBDIRS =   lib \
+            lib2 \
+            tst
+}
 TARGET = tst_qlibrary
 
 # no special install rule for subdir
-- 
cgit v0.12