AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up some conditions in our pro files

Browse Source 
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>
This commit is contained in:
Lars Knoll 2016-11-11 09:13:53 +01:00 committed by Oswald Buddenhagen
parent 6de11782d0
commit 94f9ee79a6
6 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/widgets/widgets.pro
View File

@ -22,11 +22,9 @@ SUBDIRS = \
tutorials \ tutorials \
widgets widgets
qtConfig(opengl(es2)?) { qtConfig(opengl): \
SUBDIRS += windowcontainer SUBDIRS += windowcontainer
}
!qtConfig(opengl(es2)?): SUBDIRS -= windowcontainer
contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= draganddrop contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= draganddrop
mac:SUBDIRS += mac mac:SUBDIRS += mac

2
src/gui/kernel/kernel.pri
View File

@ -139,7 +139,7 @@ SOURCES += \
kernel/qhighdpiscaling.cpp kernel/qhighdpiscaling.cpp
qtConfig(opengl(es2)?) { qtConfig(opengl) {
HEADERS += \ HEADERS += \
kernel/qplatformopenglcontext.h \ kernel/qplatformopenglcontext.h \
kernel/qopenglcontext.h \ kernel/qopenglcontext.h \

2
src/gui/opengl/opengl.pri
View File

@ -3,7 +3,7 @@
qtConfig(opengl): CONFIG += opengl qtConfig(opengl): CONFIG += opengl
qtConfig(opengles2): CONFIG += opengles2 qtConfig(opengles2): CONFIG += opengles2
qtConfig(opengl(es2)?) { qtConfig(opengl) {
HEADERS += opengl/qopengl.h \ HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \ opengl/qopengl_p.h \

4
src/src.pro
View File

@ -174,7 +174,7 @@ qtConfig(gui) {
src_platformsupport.depends += src_3rdparty_freetype src_platformsupport.depends += src_3rdparty_freetype
} }
SUBDIRS += src_gui src_platformsupport src_platformheaders 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_plugins.depends += src_gui src_platformsupport src_platformheaders
src_testlib.depends += src_gui # if QtGui is enabled, QtTest requires QtGui's headers src_testlib.depends += src_gui # if QtGui is enabled, QtTest requires QtGui's headers
qtConfig(widgets) { qtConfig(widgets) {
@ -182,7 +182,7 @@ qtConfig(gui) {
TOOLS += src_tools_uic TOOLS += src_tools_uic
src_plugins.depends += src_widgets src_plugins.depends += src_widgets
src_testlib.depends += src_widgets # if QtWidgets is enabled, QtTest requires QtWidgets's headers src_testlib.depends += src_widgets # if QtWidgets is enabled, QtTest requires QtWidgets's headers
qtConfig(opengl(es2)?) { qtConfig(opengl) {
SUBDIRS += src_opengl SUBDIRS += src_opengl
src_plugins.depends += src_opengl src_plugins.depends += src_opengl
} }

2
tests/auto/gui/gui.pro
View File

@ -13,4 +13,4 @@ SUBDIRS = \
util \ util \
itemmodels \ itemmodels \
!qtConfig(opengl(es2)?): SUBDIRS -= qopengl qopenglconfig !qtConfig(opengl): SUBDIRS -= qopengl qopenglconfig

2
tests/auto/gui/kernel/kernel.pro
View File

@ -34,6 +34,6 @@ win32:!winrt:qtHaveModule(network): SUBDIRS += noqteventloop
!qtHaveModule(network): SUBDIRS -= \ !qtHaveModule(network): SUBDIRS -= \
qguieventloop qguieventloop
!qtConfig(opengl(es2)?): SUBDIRS -= qopenglwindow !qtConfig(opengl): SUBDIRS -= qopenglwindow
uikit: SUBDIRS -= qclipboard uikit: SUBDIRS -= qclipboard