diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-04-07 15:22:02 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-04-07 15:22:02 +0300 |
commit | 04ea6df18a2b06efd133a4f1b13c2e38817279ae (patch) | |
tree | 73b84355c755c6e21f3f66816aeb13e6a16012cd /tests/auto/qml/qmltyperegistrar | |
parent | 4bb06cfba94bcc9ddf30d968a227d00479d475b7 (diff) | |
parent | 1089f8f226d546aef3b032a2f4391e08a3afa48d (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into tqtc/lts-5.15-opensourcev5.15.4-lts-lgpl
Change-Id: I39595f8b7ad212c842709b939226d95531819391
Diffstat (limited to 'tests/auto/qml/qmltyperegistrar')
-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 +} |