diff options
| -rw-r--r-- | mkspecs/features/qmake_use.prf | 13 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/xcb-static/xcb-static.pro | 3 |
2 files changed, 10 insertions, 6 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" diff --git a/src/plugins/platforms/xcb/xcb-static/xcb-static.pro b/src/plugins/platforms/xcb/xcb-static/xcb-static.pro index 20481e4834..a1dec2b0b5 100644 --- a/src/plugins/platforms/xcb/xcb-static/xcb-static.pro +++ b/src/plugins/platforms/xcb/xcb-static/xcb-static.pro @@ -11,8 +11,7 @@ XCB_DIR = ../../../../3rdparty/xcb INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/include/xcb $$XCB_DIR/sysinclude -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB -QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB +QMAKE_USE += xcb/nolink # ignore compiler warnings in 3rdparty code QMAKE_CFLAGS_STATIC_LIB+=-w |