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 11:36:57 +0100 |
| commit | 5e849f1ca2c5b253a190c3e46a2847ed9dbec6a3 (patch) | |
| tree | 3fe0671c5458d22bfd81d21b569da51ef1fa7383 | |
| parent | 95209ad697658529fa94ff3422d3f7b57d96451a (diff) | |
Fix release-only windows builds
The test was linking with debug version of 'foreign' in both debug
and relase.
Pick-to: 6.0
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 fe21b122c2..3589743f0c 100644 --- a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.pro +++ b/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.pro @@ -17,4 +17,9 @@ QML_IMPORT_NAME = QmlTypeRegistrarTest QML_IMPORT_VERSION = 1.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 +} |