diff options
| author | David Schulz <david.schulz@qt.io> | 2016-06-01 12:42:25 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@theqtcompany.com> | 2016-06-01 11:05:03 +0000 |
| commit | 6c18ed50d276e19dc2e36e1a5b19af6cf67c51e6 (patch) | |
| tree | 8050acee9e3d475531711d7e01a56232c14588ba /tests/manual/pluginview | |
| parent | 661c2407af1538e5bb8a37aadd18bc3e049aee2c (diff) | |
| download | qt-creator-6c18ed50d276e19dc2e36e1a5b19af6cf67c51e6.tar.gz | |
Tests: Fix linking reactivated manual plugins on win.
Change-Id: Ibd4db0c6a065dd264f693d663b4a940d2f3a7e58
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'tests/manual/pluginview')
| -rw-r--r-- | tests/manual/pluginview/plugins/plugin1/plugin1.pro | 4 | ||||
| -rw-r--r-- | tests/manual/pluginview/plugins/plugin2/plugin2.pro | 2 | ||||
| -rw-r--r-- | tests/manual/pluginview/plugins/plugin3/plugin3.pro | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/tests/manual/pluginview/plugins/plugin1/plugin1.pro b/tests/manual/pluginview/plugins/plugin1/plugin1.pro index ad7b2e4bdb..f6cbefc623 100644 --- a/tests/manual/pluginview/plugins/plugin1/plugin1.pro +++ b/tests/manual/pluginview/plugins/plugin1/plugin1.pro @@ -9,10 +9,12 @@ include(../../../../auto/qttest.pri) TARGET = $$qtLibraryTargetName(plugin1) -LIBS += -L$${OUT_PWD}/../plugin2 -L$${OUT_PWD}/../plugin3 -l$$qtLibraryTargetName(plugin2) -l$$qtLibraryTargetName(plugin3) +LIBS += -L$${OUT_PWD}/../plugin2 -L$${OUT_PWD}/../plugin3 -l$$qtLibraryName(plugin2) -l$$qtLibraryName(plugin3) osx { } else:unix { QMAKE_RPATHDIR += $${OUT_PWD}/../plugin2 QMAKE_RPATHDIR += $${OUT_PWD}/../plugin3 +} else:win32 { + DESTDIR = $$OUT_PWD } diff --git a/tests/manual/pluginview/plugins/plugin2/plugin2.pro b/tests/manual/pluginview/plugins/plugin2/plugin2.pro index 0543cc28df..b4be4db613 100644 --- a/tests/manual/pluginview/plugins/plugin2/plugin2.pro +++ b/tests/manual/pluginview/plugins/plugin2/plugin2.pro @@ -11,5 +11,7 @@ TARGET = $$qtLibraryTargetName(plugin2) osx { QMAKE_LFLAGS_SONAME = -Wl,-install_name,$${OUT_PWD}/ +} else:win32 { + DESTDIR = $$OUT_PWD } diff --git a/tests/manual/pluginview/plugins/plugin3/plugin3.pro b/tests/manual/pluginview/plugins/plugin3/plugin3.pro index 4467f7ca8e..8b2b1026a4 100644 --- a/tests/manual/pluginview/plugins/plugin3/plugin3.pro +++ b/tests/manual/pluginview/plugins/plugin3/plugin3.pro @@ -9,10 +9,12 @@ include(../../../../auto/qttest.pri) TARGET = $$qtLibraryTargetName(plugin3) -LIBS += -L$${OUT_PWD}/../plugin2 -l$$qtLibraryTargetName(plugin2) +LIBS += -L$${OUT_PWD}/../plugin2 -l$$qtLibraryName(plugin2) osx { QMAKE_LFLAGS_SONAME = -Wl,-install_name,$${OUT_PWD}/ } else:unix { QMAKE_RPATHDIR += $${OUT_PWD}/../plugin2 +} else:win32 { + DESTDIR = $$OUT_PWD } |