feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Tests: Fix linking reactivated manual plugins on win.

Browse Source 
Change-Id: Ibd4db0c6a065dd264f693d663b4a940d2f3a7e58
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
David Schulz
2016-06-01 12:42:25 +02:00
committed by David Schulz
parent 661c2407af
commit 6c18ed50d2
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/manual/pluginview/plugins/plugin1/plugin1.pro
+3 -1
View File
@@ -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
}
tests/manual/pluginview/plugins/plugin2/plugin2.pro
+2
View File
@@ -11,5 +11,7 @@ TARGET = $$qtLibraryTargetName(plugin2)
osx {
QMAKE_LFLAGS_SONAME = -Wl,-install_name,$${OUT_PWD}/
} else:win32 {
DESTDIR = $$OUT_PWD
}
tests/manual/pluginview/plugins/plugin3/plugin3.pro
+3 -1
View File
@@ -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
}