diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:49:44 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 20:43:56 +0100 |
commit | bc64ccbf00ba09e54240015bc476914b9f4f893d (patch) | |
tree | f9c178fe5572b03571245427bb7d46fbca43484a /src/corelib | |
parent | c2f167b41284cee3570434deba85f26f14ff241f (diff) |
Re-generate various CMake projects and configure after merge
Change-Id: I02f5926c6664aab518c5c81e0c33dca0818a1871
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/.prev_CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/corelib/CMakeLists.txt | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index b9b9e8eb92..db9ba4f531 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -392,8 +392,7 @@ qt_extend_target(Core CONDITION APPLE io/qstorageinfo_mac.cpp kernel/qcfsocketnotifier.cpp kernel/qcfsocketnotifier_p.h kernel/qcore_foundation.mm - kernel/qcore_mac.cpp kernel/qcore_mac_p.h - kernel/qcore_mac_objc.mm + kernel/qcore_mac.mm kernel/qcore_mac_p.h kernel/qcoreapplication_mac.cpp kernel/qeventdispatcher_cf.mm kernel/qeventdispatcher_cf_p.h LIBRARIES diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 4f53ab02f0..76f4b514b2 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -502,8 +502,7 @@ qt_extend_target(Core CONDITION APPLE io/qstorageinfo_mac.cpp kernel/qcfsocketnotifier.cpp kernel/qcfsocketnotifier_p.h kernel/qcore_foundation.mm - kernel/qcore_mac.cpp kernel/qcore_mac_p.h - kernel/qcore_mac_objc.mm + kernel/qcore_mac.mm kernel/qcore_mac_p.h kernel/qcoreapplication_mac.cpp kernel/qeventdispatcher_cf.mm kernel/qeventdispatcher_cf_p.h LIBRARIES |