diff options
| author | con <qtc-committer@nokia.com> | 2011-09-23 14:37:55 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-09-23 16:27:25 +0200 |
| commit | 9d8eb1f9723e69c51b398182ef384a1a16879c6b (patch) | |
| tree | 0384bf2c05194a2e975ab207cf71972c608e3228 | |
| parent | ffa88df344ef9a92631f4e8a5e6a0255874ca298 (diff) | |
| download | qt-creator-9d8eb1f9723e69c51b398182ef384a1a16879c6b.tar.gz | |
Fix extensionsystem auto test on windows.
Task-number: QTCREATORBUG-6006
Change-Id: I9e7caa83feba56561760b627b44de880bad6cab1
Reviewed-on: http://codereview.qt-project.org/5459
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
7 files changed, 9 insertions, 17 deletions
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro index 05e50cf8d4..138e62cc53 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro @@ -14,6 +14,4 @@ COPYFILES = $$OTHER_FILES include(../../../copy.pri) TARGET = $$qtLibraryName(plugin1) - -DESTDIR = $$OUT_PWD/../lib -LIBS += -L$$OUT_PWD/../lib +DESTDIR = $$OUT_PWD diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro index cafef0b197..3aebb92fd2 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro @@ -14,6 +14,4 @@ COPYFILES = $$OTHER_FILES include(../../../copy.pri) TARGET = $$qtLibraryName(plugin2) - -DESTDIR = $$OUT_PWD/../lib -LIBS += -L$$OUT_PWD/../lib +DESTDIR = $$OUT_PWD diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro index 1cb438ddc9..ad7a68ed5d 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro @@ -14,6 +14,4 @@ COPYFILES = $$OTHER_FILES include(../../../copy.pri) TARGET = $$qtLibraryName(plugin3) - -DESTDIR = $$OUT_PWD/../lib -LIBS += -L$$OUT_PWD/../lib +DESTDIR = $$OUT_PWD diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro index 30d319b29d..042f432c94 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro @@ -14,10 +14,9 @@ COPYFILES = $$OTHER_FILES include(../../../copy.pri) TARGET = $$qtLibraryName(plugin1) +DESTDIR = $$OUT_PWD -DESTDIR = $$OUT_PWD/../lib -LIBS += -L$$OUT_PWD/../lib - +LIBS += -L$$OUT_PWD/../plugin2 -L$$OUT_PWD/../plugin3 LIBS += -l$$qtLibraryName(plugin2) -l$$qtLibraryName(plugin3) macx { diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro index f264f9dd28..b43d9437d4 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro @@ -14,9 +14,7 @@ COPYFILES = $$OTHER_FILES include(../../../copy.pri) TARGET = $$qtLibraryName(plugin2) - -DESTDIR = $$OUT_PWD/../lib -LIBS += -L$$OUT_PWD/../lib +DESTDIR = $$OUT_PWD macx { QMAKE_LFLAGS_SONAME = -Wl,-install_name,$${OUT_PWD}/ diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro index 5dfa14fd5c..9fb23b328d 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro @@ -14,9 +14,9 @@ COPYFILES = $$OTHER_FILES include(../../../copy.pri) TARGET = $$qtLibraryName(plugin3) +DESTDIR = $$OUT_PWD -DESTDIR = $$OUT_PWD/../lib -LIBS += -L$$OUT_PWD/../lib +LIBS += -L$$OUT_PWD/../plugin2 LIBS += -l$$qtLibraryName(plugin2) macx { diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro index 4b3198fee0..5b8d73a5f8 100644 --- a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro +++ b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro @@ -14,3 +14,4 @@ COPYFILES = $$PWD/testplugin.xml include(../../copy.pri) TARGET = $$qtLibraryName(test) +DESTDIR = $$OUT_PWD |