diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-23 13:23:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-23 14:24:55 +0200 |
| commit | dd90af122154af8ba8cba16c8760c3d2a1d0fcab (patch) | |
| tree | 08dc64d9960346c4b27f42c7e58ef9d8885ac760 /src/angle/src/compiler/preprocessor/preprocessor.pro | |
| parent | b24396b925c78a59ef4a59d69a6b2633887aaf2f (diff) | |
| parent | 5cfb80a28ef6bf6820c970a6c355e6879021e46e (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
mkspecs/common/mac.conf
mkspecs/features/configure_base.prf
mkspecs/features/configure.prf
mkspecs/macx-clang-32/qmake.conf
mkspecs/macx-clang/qmake.conf
mkspecs/macx-ios-clang/qmake.conf
src/network/ssl/qsslsocket_openssl_symbols_p.h
Change-Id: I768b592e8e589662b1fdb9b8cbd633fef26845b6
Diffstat (limited to 'src/angle/src/compiler/preprocessor/preprocessor.pro')
| -rw-r--r-- | src/angle/src/compiler/preprocessor/preprocessor.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/angle/src/compiler/preprocessor/preprocessor.pro b/src/angle/src/compiler/preprocessor/preprocessor.pro index 12f644870d..cbf411623d 100644 --- a/src/angle/src/compiler/preprocessor/preprocessor.pro +++ b/src/angle/src/compiler/preprocessor/preprocessor.pro @@ -1,4 +1,5 @@ CONFIG += static +contains(QT_CONFIG, dynamicgl): CONFIG += not_installed include(../../config.pri) INCLUDEPATH = $$ANGLE_DIR/src/compiler/preprocessor |