From d5dc46d319bb1f58f8a0ba64d2ef270eecbe8e65 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sat, 13 Aug 2016 21:38:19 +0200 Subject: employ QMAKE_USE: LIBS += $$QMAKE_LIBS_FOO this migrates the cases where the build system already made (some) use of variables (possibly) set by configure. Change-Id: I43a08caed481d5f887a3a40821e71a4797760e7e Reviewed-by: Lars Knoll --- src/platformsupport/devicediscovery/devicediscovery.pri | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/platformsupport/devicediscovery/devicediscovery.pri') diff --git a/src/platformsupport/devicediscovery/devicediscovery.pri b/src/platformsupport/devicediscovery/devicediscovery.pri index 9829ae88ba..4a92c404d4 100644 --- a/src/platformsupport/devicediscovery/devicediscovery.pri +++ b/src/platformsupport/devicediscovery/devicediscovery.pri @@ -3,8 +3,7 @@ HEADERS += $$PWD/qdevicediscovery_p.h contains(QT_CONFIG, libudev) { SOURCES += $$PWD/qdevicediscovery_udev.cpp HEADERS += $$PWD/qdevicediscovery_udev_p.h - INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV - LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV + QMAKE_USE_PRIVATE += libudev } else: contains(QT_CONFIG, evdev) { SOURCES += $$PWD/qdevicediscovery_static.cpp HEADERS += $$PWD/qdevicediscovery_static_p.h -- cgit v1.2.3 From 60985aa42b37217fb4c01ed85bbf6f14410c3491 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 5 Aug 2016 13:35:39 +0200 Subject: Use qtConfig throughout in qtbase Use the new qtConfig macro in all pro/pri files. This required adding some feature entries, and adding {private,public}Feature to every referenced already existing entry. Change-Id: I164214dad1154df6ad84e86d99ed14994ef97cf4 Reviewed-by: Lars Knoll Reviewed-by: Oswald Buddenhagen --- src/platformsupport/devicediscovery/devicediscovery.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/platformsupport/devicediscovery/devicediscovery.pri') diff --git a/src/platformsupport/devicediscovery/devicediscovery.pri b/src/platformsupport/devicediscovery/devicediscovery.pri index 4a92c404d4..f4e9103130 100644 --- a/src/platformsupport/devicediscovery/devicediscovery.pri +++ b/src/platformsupport/devicediscovery/devicediscovery.pri @@ -1,10 +1,10 @@ HEADERS += $$PWD/qdevicediscovery_p.h -contains(QT_CONFIG, libudev) { +qtConfig(libudev) { SOURCES += $$PWD/qdevicediscovery_udev.cpp HEADERS += $$PWD/qdevicediscovery_udev_p.h QMAKE_USE_PRIVATE += libudev -} else: contains(QT_CONFIG, evdev) { +} else: qtConfig(evdev) { SOURCES += $$PWD/qdevicediscovery_static.cpp HEADERS += $$PWD/qdevicediscovery_static_p.h } else { -- cgit v1.2.3