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/gui/opengl | |
| 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/gui/opengl')
| -rw-r--r-- | src/gui/opengl/opengl.pri | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri index dfaf3042bc..2fc9a0e964 100644 --- a/src/gui/opengl/opengl.pri +++ b/src/gui/opengl/opengl.pri @@ -1,9 +1,9 @@ # Qt gui library, opengl module -contains(QT_CONFIG, opengl):CONFIG += opengl -contains(QT_CONFIG, opengles2):CONFIG += opengles2 +qtConfig(opengl): CONFIG += opengl +qtConfig(opengles2): CONFIG += opengles2 -contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { +qtConfig(opengl(es2)?) { HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ @@ -63,7 +63,7 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { opengl/qopengltexturehelper.cpp \ opengl/qopenglpixeltransferoptions.cpp - !contains(QT_CONFIG, opengles2) { + !qtConfig(opengles2) { HEADERS += opengl/qopenglfunctions_1_0.h \ opengl/qopenglfunctions_1_1.h \ opengl/qopenglfunctions_1_2.h \ @@ -122,7 +122,7 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { opengl/qopengltimerquery.cpp } - contains(QT_CONFIG, opengles2) { + qtConfig(opengles2) { HEADERS += opengl/qopenglfunctions_es2.h SOURCES += opengl/qopenglfunctions_es2.cpp |