diff options
| author | Tor Arne Vestbø <torarnv@gmail.com> | 2020-03-11 11:46:59 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <torarnv@gmail.com> | 2020-03-12 06:07:35 +0100 |
| commit | 5f940253bfde4b5336ff13be063f64bd1c1dbe49 (patch) | |
| tree | 0e3f43543335679b59edde6989aad1738a9a043c /qmake/Makefile.unix.macos | |
| parent | 739382a1bf2e5c8bd9b006d1f83d04a6add0eb3e (diff) | |
macOS: Merge qcore_mac cpp and mm files
Files ending with .mm are Objective-C++ files, so we don't need
a separate file for the C++ parts.
Change-Id: I3ef52bc98291fd461b889978a538e81630d17c6e
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'qmake/Makefile.unix.macos')
| -rw-r--r-- | qmake/Makefile.unix.macos | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/Makefile.unix.macos b/qmake/Makefile.unix.macos index 2708d2aab5..8f84cd88f2 100644 --- a/qmake/Makefile.unix.macos +++ b/qmake/Makefile.unix.macos @@ -12,6 +12,6 @@ QTOBJS2 = \ qcore_foundation.o QTSRCS2 = \ $(SOURCE_PATH)/src/corelib/io/qsettings_mac.cpp \ - $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp \ + $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.mm \ $(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion_darwin.mm \ $(SOURCE_PATH)/src/corelib/kernel/qcore_foundation.mm |