diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-05-19 23:01:59 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-08-19 21:05:55 +0000 |
| commit | 57378a108ca488cbf5cfaa32590fc762dcbf3315 (patch) | |
| tree | 3a8a3851959f6fc06d0a1c65ac9fa16508e12ee4 /configure.json | |
| parent | 2f108fafe98047f9ed2c85c5938579fdeb90682d (diff) | |
Add support for Apple watchOS
Change-Id: I3f9e00569458a463af2eaa5a3a16a6afd1e9c1ea
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.json b/configure.json index 7723437e03..a079572c0a 100644 --- a/configure.json +++ b/configure.json @@ -2314,7 +2314,7 @@ "description": "OpenGL ES 2.0", "enable": "input.opengl == 'es2'", "disable": "input.opengl == 'desktop' || input.opengl == 'dynamic' || input.opengl == 'no'", - "condition": "config.win32 || (!features.opengl-desktop && libs.opengl_es2)", + "condition": "config.win32 || (!config.watchos && !features.opengl-desktop && libs.opengl_es2)", "output": [ "publicFeature", "publicQtConfig", @@ -2343,7 +2343,7 @@ "enable": "input.opengl == 'desktop'", "disable": "input.opengl == 'es2' || input.opengl == 'dynamic' || input.opengl == 'no'", "condition": "(config.win32 && !config.winrt && !features.opengles2 && (config.msvc || libs.opengl)) - || (!config.win32 && libs.opengl)" + || (!config.watchos && !config.win32 && libs.opengl)" }, "opengl-dynamic": { "description": "Dynamic OpenGL", @@ -2647,7 +2647,7 @@ Specify -opengl desktop to use regular OpenGL." }, { "type": "error", - "condition": "features.gui && input.opengl != 'no' && !features.opengl-desktop && !features.opengles2 && !features.opengl-dynamic", + "condition": "features.gui && !config.watchos && input.opengl != 'no' && !features.opengl-desktop && !features.opengles2 && !features.opengl-dynamic", "message": "The OpenGL functionality tests failed! You might need to modify the include and library search paths by editing QMAKE_INCDIR_OPENGL[_ES2], QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your platform." |