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 /src/corelib/kernel/kernel.pri | |
| 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 'src/corelib/kernel/kernel.pri')
| -rw-r--r-- | src/corelib/kernel/kernel.pri | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index bd3cabc01a..749672c899 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -114,14 +114,12 @@ mac { SOURCES += \ kernel/qcfsocketnotifier.cpp \ kernel/qcoreapplication_mac.cpp \ - kernel/qcore_mac.cpp \ - kernel/qcore_foundation.mm - !nacl: SOURCES += kernel/qelapsedtimer_mac.cpp - - OBJECTIVE_SOURCES += \ - kernel/qcore_mac_objc.mm \ + kernel/qcore_foundation.mm \ + kernel/qcore_mac.mm \ kernel/qeventdispatcher_cf.mm + !nacl: SOURCES += kernel/qelapsedtimer_mac.cpp + LIBS_PRIVATE += -framework Foundation osx: LIBS_PRIVATE += -framework CoreServices -framework AppKit -framework Security |