diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-20 13:02:06 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-22 20:07:46 +0000 |
| commit | 75ad22f969de71aa1dcb56075c772af43f55c31b (patch) | |
| tree | 8ff7bbff33f6a5c46ccccd9afcf44addad4fdee1 | |
| parent | 42c5925840205349ff971f7f8e6e4b228fd06bfd (diff) | |
Fix release-only windows builds
The test was linking with debug version of 'foreign' in both debug
and relase.
Change-Id: Id567626bb5d9427b39447489d623effee731bb9b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | tests/auto/qml/qmltyperegistrar/foreign/foreign.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.pro | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/qml/qmltyperegistrar/foreign/foreign.pro b/tests/auto/qml/qmltyperegistrar/foreign/foreign.pro index 87521eac43..006439b58a 100644 --- a/tests/auto/qml/qmltyperegistrar/foreign/foreign.pro +++ b/tests/auto/qml/qmltyperegistrar/foreign/foreign.pro @@ -2,7 +2,6 @@ TEMPLATE = lib QT = core macos:CONFIG -= app_bundle -CONFIG -= debug_and_release_target SOURCES = foreign.cpp HEADERS = foreign.h diff --git a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.pro b/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.pro index 4b6303ec33..2a998c67ea 100644 --- a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.pro +++ b/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.pro @@ -18,4 +18,9 @@ QML_IMPORT_VERSION = 1.0 QML_PAST_MAJOR_VERSIONS = 0 INCLUDEPATH += foreign -LIBS += -Lforeign -lforeign +debug_and_release { + CONFIG(release, debug|release): LIBS += -Lforeign/release -lforeign + else: LIBS += -Lforeign/debug -lforeign +} else { + LIBS += -Lforeign -lforeign +} |