diff options
author | Lars Knoll <lars.knoll@qt.io> | 2016-08-05 13:35:39 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 04:28:05 +0000 |
commit | 60985aa42b37217fb4c01ed85bbf6f14410c3491 (patch) | |
tree | 710cf1c2457a9e0135d3a2cddf3bf17d2a622378 /src/corelib/kernel/kernel.pri | |
parent | 792a99438707c78ed96a1b066489f9100c24a922 (diff) |
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 <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib/kernel/kernel.pri')
-rw-r--r-- | src/corelib/kernel/kernel.pri | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index fea0d4ae2e..2388bbe9be 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -147,12 +147,12 @@ unix|integrity { kernel/qpoll_p.h \ kernel/qtimerinfo_unix_p.h - contains(QT_CONFIG, poll_select): SOURCES += kernel/qpoll.cpp - contains(QT_CONFIG, poll_poll): DEFINES += QT_HAVE_POLL - contains(QT_CONFIG, poll_ppoll): DEFINES += QT_HAVE_POLL QT_HAVE_PPOLL - contains(QT_CONFIG, poll_pollts): DEFINES += QT_HAVE_POLL QT_HAVE_POLLTS + qtConfig(poll_select): SOURCES += kernel/qpoll.cpp + qtConfig(poll_poll): DEFINES += QT_HAVE_POLL + qtConfig(poll_ppoll): DEFINES += QT_HAVE_POLL QT_HAVE_PPOLL + qtConfig(poll_pollts): DEFINES += QT_HAVE_POLL QT_HAVE_POLLTS - contains(QT_CONFIG, glib) { + qtConfig(glib) { SOURCES += \ kernel/qeventdispatcher_glib.cpp HEADERS += \ @@ -160,7 +160,7 @@ unix|integrity { QMAKE_USE_PRIVATE += glib } - contains(QT_CONFIG, clock-gettime):include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri) + qtConfig(clock-gettime): include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri) !android { SOURCES += kernel/qsharedmemory_posix.cpp \ |