diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-11-11 09:13:53 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-14 19:22:17 +0000 |
| commit | 94f9ee79a65636f1bf96671ad11641b1f6c7421a (patch) | |
| tree | 861ced678a754c6f3ce10a9e70168505bb4845e7 | |
| parent | 6de11782d093dea2e6fe9406fb712706a984ff61 (diff) | |
Clean up some conditions in our pro files
Change qtConfig(opengl(es2)?) to qtConfig(opengl) as that covers
the case without any regular expression.
Change-Id: I935e3150f87e195e8bd3d0e55b4ed43572b131cf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -rw-r--r-- | examples/widgets/widgets.pro | 4 | ||||
| -rw-r--r-- | src/gui/kernel/kernel.pri | 2 | ||||
| -rw-r--r-- | src/gui/opengl/opengl.pri | 2 | ||||
| -rw-r--r-- | src/src.pro | 4 | ||||
| -rw-r--r-- | tests/auto/gui/gui.pro | 2 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/kernel.pro | 2 |
6 files changed, 7 insertions, 9 deletions
diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index 65a96dd718..513ddc91f2 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -22,11 +22,9 @@ SUBDIRS = \ tutorials \ widgets -qtConfig(opengl(es2)?) { +qtConfig(opengl): \ SUBDIRS += windowcontainer -} -!qtConfig(opengl(es2)?): SUBDIRS -= windowcontainer contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= draganddrop mac:SUBDIRS += mac diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 3b7e03a0ff..792ca9fbaf 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -139,7 +139,7 @@ SOURCES += \ kernel/qhighdpiscaling.cpp -qtConfig(opengl(es2)?) { +qtConfig(opengl) { HEADERS += \ kernel/qplatformopenglcontext.h \ kernel/qopenglcontext.h \ diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri index 2c3cca6b18..712cf144e0 100644 --- a/src/gui/opengl/opengl.pri +++ b/src/gui/opengl/opengl.pri @@ -3,7 +3,7 @@ qtConfig(opengl): CONFIG += opengl qtConfig(opengles2): CONFIG += opengles2 -qtConfig(opengl(es2)?) { +qtConfig(opengl) { HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ diff --git a/src/src.pro b/src/src.pro index 87391eab5b..f19b0bd354 100644 --- a/src/src.pro +++ b/src/src.pro @@ -174,7 +174,7 @@ qtConfig(gui) { src_platformsupport.depends += src_3rdparty_freetype } SUBDIRS += src_gui src_platformsupport src_platformheaders - qtConfig(opengl(es2)?): SUBDIRS += src_openglextensions + qtConfig(opengl): SUBDIRS += src_openglextensions src_plugins.depends += src_gui src_platformsupport src_platformheaders src_testlib.depends += src_gui # if QtGui is enabled, QtTest requires QtGui's headers qtConfig(widgets) { @@ -182,7 +182,7 @@ qtConfig(gui) { TOOLS += src_tools_uic src_plugins.depends += src_widgets src_testlib.depends += src_widgets # if QtWidgets is enabled, QtTest requires QtWidgets's headers - qtConfig(opengl(es2)?) { + qtConfig(opengl) { SUBDIRS += src_opengl src_plugins.depends += src_opengl } diff --git a/tests/auto/gui/gui.pro b/tests/auto/gui/gui.pro index 8d8a2df393..2fd3024afe 100644 --- a/tests/auto/gui/gui.pro +++ b/tests/auto/gui/gui.pro @@ -13,4 +13,4 @@ SUBDIRS = \ util \ itemmodels \ -!qtConfig(opengl(es2)?): SUBDIRS -= qopengl qopenglconfig +!qtConfig(opengl): SUBDIRS -= qopengl qopenglconfig diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro index 631962ad34..559395a9ae 100644 --- a/tests/auto/gui/kernel/kernel.pro +++ b/tests/auto/gui/kernel/kernel.pro @@ -34,6 +34,6 @@ win32:!winrt:qtHaveModule(network): SUBDIRS += noqteventloop !qtHaveModule(network): SUBDIRS -= \ qguieventloop -!qtConfig(opengl(es2)?): SUBDIRS -= qopenglwindow +!qtConfig(opengl): SUBDIRS -= qopenglwindow uikit: SUBDIRS -= qclipboard |