From b9a578ebc604e5f919c633ec8bee99aa8d21071d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 23 Nov 2017 21:20:32 +0100 Subject: configure: change convention of passing libraries to config tests instead of pre-resolving them and passing the final LIBS to qmake, pass raw QMAKE_*_LIBS* assignments and a QMAKE_USE stanza. the immediate benefit of that is that it centralizes the debug/release lib handling, which makes build variant overrides available to all libraries, not just a few selected ones. note that this removes the CONFIG+=build_all from the test projects. turns out that this was ineffective to start with, as config tests are built with an explicit CONFIG-=debug_and_release. we might re-instate it in a non-broken way later on. Change-Id: I2117c5b36937e8230bd571dcee83231515cbe30b Reviewed-by: Joerg Bornemann --- src/corelib/configure.json | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src') diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 5e48024def..b03cf2f9d5 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -64,13 +64,6 @@ "UCollator *collator = ucol_open(\"ru_RU\", &status);", "if (!U_FAILURE(status))", " ucol_close(collator);" - ], - "qmake": [ - "CONFIG += build_all", - "CONFIG(debug, debug|release): \\", - " LIBS += $$LIBS_DEBUG", - "else: \\", - " LIBS += $$LIBS_RELEASE" ] }, "sources": [ -- cgit v1.2.3