From bbfc95914fa21f2025bb29ae17103502265e2cf6 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 25 Apr 2019 12:51:49 +0200 Subject: Fix determination of OpenGL include paths on macOS, take 3 The sysrootification of QMAKE_INCDIR_OPENGL on macOS must happen only once. Commit 49ef3773 addressed this but stored the sysrootified QMAKE_INCDIR_OPENGL in qt_lib_gui_private.pri. For installer packages, these paths are the paths of the build machine and most likely wrong on the user's machine. This reverts commit 4949ef377349ba4dae840c2d5caa36e2d516707baa and restores the sysrootification in sdk.prf. The original include paths are assigned to QMAKE_EXPORT_INCDIR_OPENGL and stored as QMAKE_INCDIR_OPENGL in qt_lib_gui_private.pri. Fixes: QTBUG-75374 Task-number: QTBUG-73736 Change-Id: I4c0f65866d60660c632363dba3adc7ea2e344bfc Reviewed-by: Alexandru Croitor --- src/gui/configure.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/configure.json') diff --git a/src/gui/configure.json b/src/gui/configure.json index 6fdcd562a7..5039934c26 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -448,7 +448,7 @@ ], "sources": [ { "type": "pkgConfig", "args": "gl", "condition": "!config.darwin" }, - { "type": "openglMakeSpec" } + { "type": "makeSpec", "spec": "OPENGL" } ] }, "opengl_es2": { -- cgit v1.2.3