6755ec891a
Conflicts: configure qmake/Makefile.unix.macos qmake/Makefile.unix.win32 qmake/generators/win32/msvc_vcproj.cpp src/3rdparty/pcre/qt_attribution.json src/corelib/io/qsettings.cpp src/corelib/kernel/qdeadlinetimer.cpp src/platformsupport/kmsconvenience/qkmsdevice.cpp src/platformsupport/kmsconvenience/qkmsdevice_p.h src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h tests/manual/qstorageinfo/printvolumes.cpp tools/configure/configureapp.cpp Change-Id: Ibaabcc8e965c44926f9fb018466e8b132b8df49e
18 lines
595 B
Makefile
18 lines
595 B
Makefile
COCOA_LFLAGS = -framework Foundation -framework CoreServices
|
|
CARBON_LFLAGS = -framework ApplicationServices
|
|
CARBON_CFLAGS = -fconstant-cfstrings
|
|
|
|
EXTRA_CXXFLAGS = $(CARBON_CFLAGS)
|
|
EXTRA_LFLAGS = $(COCOA_LFLAGS) $(CARBON_LFLAGS)
|
|
|
|
QTOBJS2 = \
|
|
qsettings_mac.o \
|
|
qcore_mac.o \
|
|
qoperatingsystemversion_darwin.o \
|
|
qcore_foundation.o
|
|
QTSRCS2 = \
|
|
$(SOURCE_PATH)/src/corelib/io/qsettings_mac.cpp \
|
|
$(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp \
|
|
$(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion_darwin.mm \
|
|
$(SOURCE_PATH)/src/corelib/kernel/qcore_foundation.mm
|