summaryrefslogtreecommitdiffstats
path: root/mkspecs/win32-icc-k1om
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2019-04-25 12:51:49 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2019-04-27 07:32:53 +0000
commitbbfc95914fa21f2025bb29ae17103502265e2cf6 (patch)
tree633460072061936db62b373844cb68befaf9a36b /mkspecs/win32-icc-k1om
parenta3acf568d1785d15ebf4d9973df6f9c277d5158a (diff)
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 <alexandru.croitor@qt.io>
Diffstat (limited to 'mkspecs/win32-icc-k1om')
0 files changed, 0 insertions, 0 deletions