diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
| commit | ff922e7b87de147797fbd759167878aec7625f0c (patch) | |
| tree | a326819f23e2421723f144522f9362ba608d6bb1 /src/corelib/kernel/kernel.pri | |
| parent | e464e1eb8eb63c631fb0916c3ea4540a88d8aad3 (diff) | |
| parent | 75f52bd0ddc4afbd181c14b310d256e3507052d6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/kernel/qmetatype.cpp
Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a
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 |