diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-23 07:18:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-23 10:29:37 +0200 |
| commit | 5cfb80a28ef6bf6820c970a6c355e6879021e46e (patch) | |
| tree | e60f1f43e9670e82923e3c2d0d19b29198b9c300 /src/angle/src/compiler/preprocessor/preprocessor.pro | |
| parent | 930e750b7aca024b839c9856cfcc79aab8c0abbc (diff) | |
| parent | f4be16e1f7828a0f6992ef2e20b9106177d7fc88 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/angle/src/libGLESv2/libGLESv2.pro
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
Change-Id: If8da4cfe8f57fea9f78e7239f378a6302c01674e
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 |