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/printsupport/kernel/kernel.pri | 2 +- src/printsupport/widgets/widgets.pri | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/printsupport') diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri index bf95d9e8f6..22d12e4cc3 100644 --- a/src/printsupport/kernel/kernel.pri +++ b/src/printsupport/kernel/kernel.pri @@ -33,7 +33,7 @@ win32 { LIBS_PRIVATE += -lwinspool -lcomdlg32 -lgdi32 -luser32 } -unix:!mac:contains(QT_CONFIG, cups): { +unix:!darwin:qtConfig(cups) { SOURCES += $$PWD/qcups.cpp HEADERS += $$PWD/qcups_p.h } diff --git a/src/printsupport/widgets/widgets.pri b/src/printsupport/widgets/widgets.pri index 8e5cb12a6d..8a98da1718 100644 --- a/src/printsupport/widgets/widgets.pri +++ b/src/printsupport/widgets/widgets.pri @@ -1,7 +1,7 @@ HEADERS += widgets/qprintpreviewwidget.h SOURCES += widgets/qprintpreviewwidget.cpp -unix:!mac:contains(QT_CONFIG, cups): { +unix:!darwin:qtConfig(cups) { HEADERS += widgets/qcupsjobwidget_p.h SOURCES += widgets/qcupsjobwidget.cpp FORMS += widgets/qcupsjobwidget.ui -- cgit v1.2.3