bbfc95914f
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>
53 lines
1.5 KiB
Plaintext
53 lines
1.5 KiB
Plaintext
#
|
|
# qmake configuration common to OS X and iOS
|
|
#
|
|
|
|
!load(device_config): error(Could not successfully load device configuration)
|
|
|
|
QMAKE_PLATFORM += mac darwin
|
|
|
|
MAKEFILE_GENERATOR = UNIX
|
|
CONFIG += app_bundle incremental global_init_link_order lib_version_first sdk
|
|
QMAKE_INCREMENTAL_STYLE = sublib
|
|
|
|
include(unix.conf)
|
|
|
|
QMAKE_RESOURCE = /Developer/Tools/Rez
|
|
QMAKE_EXTENSION_SHLIB = dylib
|
|
QMAKE_EXTENSIONS_AUX_SHLIB = tbd
|
|
QMAKE_LIBDIR =
|
|
|
|
# sdk.prf will prefix the proper SDK sysroot
|
|
QMAKE_INCDIR_OPENGL = \
|
|
/System/Library/Frameworks/OpenGL.framework/Headers \
|
|
/System/Library/Frameworks/AGL.framework/Headers/
|
|
|
|
QMAKE_FIX_RPATH = install_name_tool -id
|
|
|
|
QMAKE_LFLAGS_RPATH = -Wl,-rpath,
|
|
QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip
|
|
|
|
QMAKE_LFLAGS_REL_RPATH =
|
|
QMAKE_REL_RPATH_BASE = @loader_path
|
|
|
|
QMAKE_LIBS_DYNLOAD =
|
|
QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL
|
|
QMAKE_LIBS_THREAD =
|
|
|
|
QMAKE_INCDIR_WAYLAND =
|
|
QMAKE_LIBS_WAYLAND_CLIENT = -lwayland-client
|
|
QMAKE_LIBS_WAYLAND_SERVER = -lwayland-server
|
|
QMAKE_LIBDIR_WAYLAND =
|
|
QMAKE_DEFINES_WAYLAND =
|
|
QMAKE_WAYLAND_SCANNER = wayland-scanner
|
|
|
|
QMAKE_ACTOOL = actool
|
|
|
|
QMAKE_DSYMUTIL = dsymutil
|
|
QMAKE_STRIP = $${CROSS_COMPILE}strip
|
|
QMAKE_STRIPFLAGS_LIB += -S -x
|
|
|
|
QMAKE_AR = $${CROSS_COMPILE}ar cq
|
|
QMAKE_RANLIB = $${CROSS_COMPILE}ranlib -s
|
|
QMAKE_NM = $${CROSS_COMPILE}nm -P
|