diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:48:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:49:18 +0100 |
| commit | dd756011da13b95fdb630a1bbb90234f1e60f415 (patch) | |
| tree | a6259b1e9b6463108796ce912e3d1752e301505f /src/gui/configure.json | |
| parent | 0c50edbe84914469973a3b10e0170023ccdd66fe (diff) | |
| parent | b6bf2a33f4c33a212da7b58a049b3b5b20b3f327 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
configure.json
mkspecs/win32-icc/qmake.conf
Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 02032dee8f..6d0848c9f0 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -182,7 +182,7 @@ "label": "Desktop OpenGL", "test": "unix/opengldesktop", "sources": [ - { "type": "pkgConfig", "args": "gl" }, + { "type": "pkgConfig", "args": "gl", "condition": "!config.darwin" }, { "type": "makeSpec", "spec": "OPENGL" } ] }, @@ -190,7 +190,7 @@ "label": "OpenGL ES 2.0", "test": "unix/opengles2", "sources": [ - { "type": "pkgConfig", "args": "glesv2" }, + { "type": "pkgConfig", "args": "glesv2", "condition": "!config.darwin" }, { "type": "makeSpec", "spec": "OPENGL_ES2" } ] }, |