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/angle/src | |
| 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/angle/src')
| -rw-r--r-- | src/angle/src/common/common.pri | 2 | ||||
| -rw-r--r-- | src/angle/src/compiler/preprocessor/preprocessor.pro | 2 | ||||
| -rw-r--r-- | src/angle/src/compiler/translator.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri index 9eae06d410..c948e27dc3 100644 --- a/src/angle/src/common/common.pri +++ b/src/angle/src/common/common.pri @@ -1,5 +1,5 @@ # static builds should still link ANGLE dynamically when dynamic GL is enabled -static:contains(QT_CONFIG, dynamicgl) { +static:qtConfig(dynamicgl) { CONFIG -= static CONFIG += shared } diff --git a/src/angle/src/compiler/preprocessor/preprocessor.pro b/src/angle/src/compiler/preprocessor/preprocessor.pro index cbf411623d..f9170b3bee 100644 --- a/src/angle/src/compiler/preprocessor/preprocessor.pro +++ b/src/angle/src/compiler/preprocessor/preprocessor.pro @@ -1,5 +1,5 @@ CONFIG += static -contains(QT_CONFIG, dynamicgl): CONFIG += not_installed +qtConfig(dynamicgl): CONFIG += not_installed include(../../config.pri) INCLUDEPATH = $$ANGLE_DIR/src/compiler/preprocessor diff --git a/src/angle/src/compiler/translator.pro b/src/angle/src/compiler/translator.pro index d48ac70472..cee13d06bb 100644 --- a/src/angle/src/compiler/translator.pro +++ b/src/angle/src/compiler/translator.pro @@ -1,5 +1,5 @@ CONFIG += static -contains(QT_CONFIG, dynamicgl): CONFIG += not_installed +qtConfig(dynamicgl): CONFIG += not_installed include(../config.pri) INCLUDEPATH += \ |