From b495786061febf5e4c6baddbd6443f44f142c627 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 2 Dec 2009 12:14:00 +0100
Subject: really fix mingw+msys

i missed the fact that lib2/ was duplicating the magic (totally
pointlessly). so now all the magic moved to lib2/, as lib/ is not used
on symbian anyway.
---
 tests/auto/qlibrary/lib/lib.pro   | 18 ------------------
 tests/auto/qlibrary/lib2/lib2.pro | 22 +++++++++++++---------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/tests/auto/qlibrary/lib/lib.pro b/tests/auto/qlibrary/lib/lib.pro
index f8132ac..6d80881 100644
--- a/tests/auto/qlibrary/lib/lib.pro
+++ b/tests/auto/qlibrary/lib/lib.pro
@@ -10,24 +10,6 @@ wince*: DEFINES += WIN32_MSVC
 win32-msvc: DEFINES += WIN32_MSVC
 win32-borland: DEFINES += WIN32_BORLAND
 
-# Force a copy of the library to have an extension that is non-standard.
-# We want to test if we can load a shared library with *any* filename...
-
-# For windows test if we can load a filename with multiple dots.
-win32: {
-    cp = $(COPY) $(DESTDIR_TARGET) ..$$QMAKE_DIR_SEP
-    QMAKE_POST_LINK = \
-        $${cp}mylib.dl2 && \
-        $${cp}system.trolltech.test.mylib.dll && \
-        $${cp}mylib_noextension
-}
-unix:!symbian: {
-    cp = $(COPY) $(DESTDIR)$(TARGET) ../
-    QMAKE_POST_LINK = \
-        $${cp}libmylib.so2 && \
-        $${cp}system.trolltech.test.mylib.so
-}
-
 #no special install rule for the library used by test
 INSTALLS =
 
diff --git a/tests/auto/qlibrary/lib2/lib2.pro b/tests/auto/qlibrary/lib2/lib2.pro
index fc00af8..da30a2d 100644
--- a/tests/auto/qlibrary/lib2/lib2.pro
+++ b/tests/auto/qlibrary/lib2/lib2.pro
@@ -14,15 +14,19 @@ win32-borland: DEFINES += WIN32_BORLAND
 # Force a copy of the library to have an extension that is non-standard.
 # We want to test if we can load a shared library with *any* filename...
 
-# For windows test if we can load a filename with multiple dots.
-win32: {
-    QMAKE_POST_LINK = copy /Y ..\mylib2.dll ..\mylib.dl2 && \
-    copy /Y ..\mylib2.dll ..\system.trolltech.test.mylib.dll
-}
-
-unix:!symbian: {
-    QMAKE_POST_LINK = cp -f $(DESTDIR)$(TARGET) ../libmylib.so2 && \
-    cp -f $(DESTDIR)$(TARGET) ../system.trolltech.test.mylib.so
+!symbian {
+    win32 {
+        src = $(DESTDIR_TARGET)
+        files = mylib.dl2 system.trolltech.test.mylib.dll
+    } else {
+        src = $(DESTDIR)$(TARGET)
+        files = libmylib.so2 system.trolltech.test.mylib.so
+    }
+    for(file, files) {
+        QMAKE_POST_LINK += $(COPY) $$src ..$$QMAKE_DIR_SEP$$file &&
+        CLEAN_FILES += ../$$file
+    }
+    QMAKE_POST_LINK = $$member(QMAKE_POST_LINK, 0, -2)
 }
 
 symbian-abld: {
-- 
cgit v0.12