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 /qmake | |
| 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 'qmake')
| -rw-r--r-- | qmake/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | qmake/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index 5d32aa4251..e926f1d125 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -165,7 +165,7 @@ qt_extend_target(qmake CONDITION UNIX qt_extend_target(qmake CONDITION MACOS SOURCES qcore_foundation.mm - qcore_mac.cpp + qcore_mac.mm qoperatingsystemversion_darwin.mm qsettings_mac.cpp PUBLIC_LIBRARIES diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 4c8160eda5..4f8a37a36c 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -168,7 +168,7 @@ qt_extend_target(qmake CONDITION UNIX qt_extend_target(qmake CONDITION MACOS SOURCES ../src/corelib/kernel/qcore_foundation.mm # special case - ../src/corelib/kernel/qcore_mac.cpp # special case + ../src/corelib/kernel/qcore_mac.mm # special case ../src/corelib/global/qoperatingsystemversion_darwin.mm # special case ../src/corelib/io/qsettings_mac.cpp # special case PUBLIC_LIBRARIES |