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/plugins/imageformats/imageformats.pro | 6 +++--- src/plugins/imageformats/jpeg/jpeg.pro | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/imageformats') diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index f3ed37b722..d2588c1b18 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -contains(QT_CONFIG, ico): SUBDIRS += ico -contains(QT_CONFIG, jpeg): SUBDIRS += jpeg -contains(QT_CONFIG, gif): SUBDIRS += gif +qtConfig(ico): SUBDIRS += ico +qtConfig(jpeg): SUBDIRS += jpeg +qtConfig(gif): SUBDIRS += gif diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro index 3cbf60ec8a..89476e62f5 100644 --- a/src/plugins/imageformats/jpeg/jpeg.pro +++ b/src/plugins/imageformats/jpeg/jpeg.pro @@ -5,7 +5,7 @@ QT += core-private gui-private SOURCES += main.cpp qjpeghandler.cpp HEADERS += main.h qjpeghandler_p.h -contains(QT_CONFIG, system-jpeg) { +qtConfig(system-jpeg) { QMAKE_USE += libjpeg } else { include($$PWD/../../../3rdparty/libjpeg.pri) -- cgit v1.2.3