diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-23 21:20:32 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-05-08 18:17:29 +0000 |
| commit | b9a578ebc604e5f919c633ec8bee99aa8d21071d (patch) | |
| tree | 52036140d273d42573cbd6251c14c8c4b45f1818 /configure.json | |
| parent | 290f953253afc5935382525cd4b72e091865cab5 (diff) | |
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 <joerg.bornemann@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/configure.json b/configure.json index 6e48f5da61..276af319ac 100644 --- a/configure.json +++ b/configure.json @@ -168,14 +168,7 @@ "label": "D-Bus >= 1.2", "test": { "include": "dbus/dbus.h", - "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);", - "qmake": [ - "CONFIG += build_all", - "CONFIG(debug, debug|release): \\", - " LIBS += $$LIBS_DEBUG", - "else: \\", - " LIBS += $$LIBS_RELEASE" - ] + "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);" }, "sources": [ { "type": "pkgConfig", "args": "dbus-1 >= 1.2" }, |