summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-09-29 17:57:53 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-10-04 20:20:18 +0000
commitcd8b7fb86517cda1adbfe8fda7beaafddfe5c9bb (patch)
tree8b5ef321679a00dbea401e00f6c8cee21b52f36e /mkspecs
parent1e97037ed97aade9eb107bbc595785c2de76f7dc (diff)
make QMAKE_USE parameterizable
it's now possible to declare references which don't cause linking (or cause only linking). make use of this in the xcb-static library. Change-Id: Ic429e0a1200b3a333738ea8d8e576ff64b6cac21 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qmake_use.prf13
1 files changed, 9 insertions, 4 deletions
diff --git a/mkspecs/features/qmake_use.prf b/mkspecs/features/qmake_use.prf
index 41d959cf83..a8e2e6c417 100644
--- a/mkspecs/features/qmake_use.prf
+++ b/mkspecs/features/qmake_use.prf
@@ -1,7 +1,9 @@
suffix =
for(ever) {
QMAKE_USE$${suffix} = $$unique(QMAKE_USE$${suffix})
- for (name, QMAKE_USE$${suffix}) {
+ for (use, QMAKE_USE$${suffix}) {
+ use = $$split(use, /)
+ name = $$take_first(use)
nu = $$upper($$name)
debug: \
libs = $$eval(QMAKE_LIBS_$${nu}_DEBUG)
@@ -13,9 +15,12 @@ for(ever) {
isEmpty(libs):isEmpty(cflags): \
error("Library '$$name' is not defined.")
- LIBS$${suffix} += $$libs
- QMAKE_CFLAGS += $$cflags
- QMAKE_CXXFLAGS += $$cflags
+ !contains(use, nolink): \
+ LIBS$${suffix} += $$libs
+ !contains(use, linkonly) {
+ QMAKE_CFLAGS += $$cflags
+ QMAKE_CXXFLAGS += $$cflags
+ }
}
!isEmpty(suffix): break()
suffix = "_PRIVATE"