diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-02-20 09:47:27 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-02-27 09:53:52 +0000 |
| commit | 49ef377349ba4dae840c2d5caa36e2d516707baa (patch) | |
| tree | 826f7db462e39834b82240525f8a438443e75227 /src/gui/configure.json | |
| parent | 2c31516a1eb05597a5c7474448b7b413f5dc34c5 (diff) | |
Fix determination of OpenGL include paths on macOS, take 2
The sysrootification of OpenGL include paths must be done only once: at
configure time. The resolved paths are stored since 521a8539 and must not be
resolved again.
Turn the makeSpec-type opengl library into a custom-type one, and do
the sysrootification in the handler function.
Fixes: QTBUG-73736
Change-Id: I2933144057d6f01d8bfc7bda2c2df56c57303459
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 44140bc7b6..e4f25ab313 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -448,7 +448,7 @@ ], "sources": [ { "type": "pkgConfig", "args": "gl", "condition": "!config.darwin" }, - { "type": "makeSpec", "spec": "OPENGL" } + { "type": "openglMakeSpec" } ] }, "opengl_es2": { |