diff options
author | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:06:10 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:54:41 +0200 |
commit | 6a772fd201ac738dc86e71bd82e98f65158e6335 (patch) | |
tree | 674007720f41d27b251bbcffd7a368a93f88eb96 /src/gui/configure.json | |
parent | 40206a9f6d7635bb19305d1c8d74908808e3529e (diff) | |
parent | 4c346b6e2bfab976bc9b16275b8382aee38aefa4 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
mkspecs/common/msvc-desktop.conf
mkspecs/win32-g++/qmake.conf
mkspecs/win32-icc/qmake.conf
src/platformsupport/fontdatabases/mac/coretext.pri
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
Diffstat (limited to 'src/gui/configure.json')
-rw-r--r-- | src/gui/configure.json | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 672128a789..d074bf6794 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -9,6 +9,7 @@ "options": { "accessibility": "boolean", "angle": "boolean", + "combined-angle-lib": "boolean", "direct2d": "boolean", "directfb": "boolean", "directwrite": "boolean", @@ -443,6 +444,13 @@ { "type": "define", "name": "QT_OPENGL_ES_2_ANGLE" } ] }, + "combined-angle-lib": { + "label": "Combined ANGLE Library", + "autoDetect": false, + "enable": "features.angle", + "condition": "features.angle", + "output": [ "publicFeature" ] + }, "directfb": { "label": "DirectFB", "section": "Platform plugins", @@ -1111,6 +1119,11 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla "args": "angle", "condition": "config.win32" }, + { + "type": "feature", + "args": "combined-angle-lib", + "condition": "features.angle" + }, "opengl-desktop", { "type": "feature", |