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 /examples/widgets | |
| 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 'examples/widgets')
| -rw-r--r-- | examples/widgets/graphicsview/boxes/boxes.pro | 2 | ||||
| -rw-r--r-- | examples/widgets/graphicsview/graphicsview.pro | 2 | ||||
| -rw-r--r-- | examples/widgets/painting/composition/composition.pro | 2 | ||||
| -rw-r--r-- | examples/widgets/painting/shared/shared.pri | 2 | ||||
| -rw-r--r-- | examples/widgets/widgets.pro | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/examples/widgets/graphicsview/boxes/boxes.pro b/examples/widgets/graphicsview/boxes/boxes.pro index 14d22537e8..afdca816b1 100644 --- a/examples/widgets/graphicsview/boxes/boxes.pro +++ b/examples/widgets/graphicsview/boxes/boxes.pro @@ -1,6 +1,6 @@ QT += opengl widgets -contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop") +qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop") HEADERS += 3rdparty/fbm.h \ glbuffers.h \ diff --git a/examples/widgets/graphicsview/graphicsview.pro b/examples/widgets/graphicsview/graphicsview.pro index 06a7ce8071..5a054fe6b2 100644 --- a/examples/widgets/graphicsview/graphicsview.pro +++ b/examples/widgets/graphicsview/graphicsview.pro @@ -15,6 +15,6 @@ SUBDIRS = \ contains(DEFINES, QT_NO_CURSOR)|contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= dragdroprobot -qtHaveModule(opengl):!contains(QT_CONFIG, opengles.):!contains(QT_CONFIG,dynamicgl) { +qtHaveModule(opengl):!qtConfig(opengles.):!qtConfig(dynamicgl) { SUBDIRS += boxes } diff --git a/examples/widgets/painting/composition/composition.pro b/examples/widgets/painting/composition/composition.pro index 7d174ca2bc..5fdbe4a5a2 100644 --- a/examples/widgets/painting/composition/composition.pro +++ b/examples/widgets/painting/composition/composition.pro @@ -6,7 +6,7 @@ SHARED_FOLDER = ../shared include($$SHARED_FOLDER/shared.pri) RESOURCES += composition.qrc -qtHaveModule(opengl): !contains(QT_CONFIG,dynamicgl) { +qtHaveModule(opengl):!qtConfig(dynamicgl) { DEFINES += USE_OPENGL QT += opengl } diff --git a/examples/widgets/painting/shared/shared.pri b/examples/widgets/painting/shared/shared.pri index c8d119f4e5..362cc6819c 100644 --- a/examples/widgets/painting/shared/shared.pri +++ b/examples/widgets/painting/shared/shared.pri @@ -1,6 +1,6 @@ INCLUDEPATH += $$PWD -qtHaveModule(opengl)|contains(QT_CONFIG, opengles2) { +qtHaveModule(opengl)|qtConfig(opengles2) { DEFINES += QT_OPENGL_SUPPORT QT += opengl widgets } diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index cc489b5c16..65a96dd718 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -22,11 +22,11 @@ SUBDIRS = \ tutorials \ widgets -contains(QT_CONFIG, opengl(es2)?) { +qtConfig(opengl(es2)?) { SUBDIRS += windowcontainer } -!contains(QT_CONFIG, opengl(es2)?): SUBDIRS -= windowcontainer +!qtConfig(opengl(es2)?): SUBDIRS -= windowcontainer contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= draganddrop mac:SUBDIRS += mac |