diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-13 09:36:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-13 09:39:20 +0100 |
| commit | 6755ec891a1740110c48895afd53d39e8370704a (patch) | |
| tree | 982606f3bc582262e4b315a63f55ccb141fff97b /qmake/Makefile.unix.macos | |
| parent | 449204f8c0d6679ae0e58dbb8a30b8a86fbdb4ec (diff) | |
| parent | 00c9ec63a552d040e851b561c11428fabf1a2b08 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
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
Diffstat (limited to 'qmake/Makefile.unix.macos')
| -rw-r--r-- | qmake/Makefile.unix.macos | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/qmake/Makefile.unix.macos b/qmake/Makefile.unix.macos new file mode 100644 index 0000000000..2708d2aab5 --- /dev/null +++ b/qmake/Makefile.unix.macos @@ -0,0 +1,17 @@ +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 |