summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/widgets/tutorials/notepad/.prev_CMakeLists.txt2
-rw-r--r--examples/widgets/tutorials/notepad/CMakeLists.txt2
-rw-r--r--qmake/.prev_CMakeLists.txt2
-rw-r--r--qmake/CMakeLists.txt2
-rw-r--r--src/corelib/.prev_CMakeLists.txt3
-rw-r--r--src/corelib/CMakeLists.txt3
-rw-r--r--src/gui/configure.cmake2
-rw-r--r--src/plugins/platforms/.prev_CMakeLists.txt4
-rw-r--r--src/plugins/platforms/CMakeLists.txt4
-rw-r--r--src/plugins/platforms/ios/CMakeLists.txt10
-rw-r--r--src/tools/bootstrap/.prev_CMakeLists.txt3
-rw-r--r--src/tools/bootstrap/CMakeLists.txt3
12 files changed, 21 insertions, 19 deletions
diff --git a/examples/widgets/tutorials/notepad/.prev_CMakeLists.txt b/examples/widgets/tutorials/notepad/.prev_CMakeLists.txt
index 32df7ad615..3d874dec97 100644
--- a/examples/widgets/tutorials/notepad/.prev_CMakeLists.txt
+++ b/examples/widgets/tutorials/notepad/.prev_CMakeLists.txt
@@ -13,6 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/notepad")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(notepad
main.cpp
@@ -21,6 +22,7 @@ add_qt_gui_executable(notepad
target_link_libraries(notepad PUBLIC
Qt::Core
Qt::Gui
+ Qt::Widgets
)
diff --git a/examples/widgets/tutorials/notepad/CMakeLists.txt b/examples/widgets/tutorials/notepad/CMakeLists.txt
index 2a277efb26..aab7e536b3 100644
--- a/examples/widgets/tutorials/notepad/CMakeLists.txt
+++ b/examples/widgets/tutorials/notepad/CMakeLists.txt
@@ -13,6 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/notepad")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS PrintSupport) # special case: add
add_qt_gui_executable(notepad
@@ -22,6 +23,7 @@ add_qt_gui_executable(notepad
target_link_libraries(notepad PUBLIC
Qt::Core
Qt::Gui
+ Qt::Widgets
)
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
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
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
index f17949bc53..bf9d0e71f1 100644
--- a/src/gui/configure.cmake
+++ b/src/gui/configure.cmake
@@ -698,7 +698,7 @@ qt_feature("vsp2" PRIVATE
qt_feature("vnc" PRIVATE
SECTION "Platform plugins"
LABEL "VNC"
- CONDITION ( UNIX AND NOT ANDROID AND NOT APPLE ) AND ( QT_FEATURE_regularexpression AND QT_FEATURE_network )
+ CONDITION ( UNIX AND NOT ANDROID AND NOT APPLE AND NOT WASM ) AND ( QT_FEATURE_regularexpression AND QT_FEATURE_network )
)
qt_feature("mtdev" PRIVATE
LABEL "mtdev"
diff --git a/src/plugins/platforms/.prev_CMakeLists.txt b/src/plugins/platforms/.prev_CMakeLists.txt
index c58fb31aea..6727afcb89 100644
--- a/src/plugins/platforms/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/.prev_CMakeLists.txt
@@ -3,10 +3,10 @@
if(ANDROID AND NOT ANDROID_EMBEDDED)
add_subdirectory(android)
endif()
-if(NOT ANDROID)
+if(NOT ANDROID AND NOT WASM)
add_subdirectory(minimal)
endif()
-if(QT_FEATURE_freetype AND NOT ANDROID)
+if(QT_FEATURE_freetype AND NOT ANDROID AND NOT WASM)
add_subdirectory(offscreen)
endif()
if(QT_FEATURE_xcb)
diff --git a/src/plugins/platforms/CMakeLists.txt b/src/plugins/platforms/CMakeLists.txt
index 442596286a..c01dc5b28a 100644
--- a/src/plugins/platforms/CMakeLists.txt
+++ b/src/plugins/platforms/CMakeLists.txt
@@ -3,10 +3,10 @@
if(ANDROID AND NOT ANDROID_EMBEDDED)
add_subdirectory(android)
endif()
-if(NOT ANDROID)
+if(NOT ANDROID AND NOT WASM)
add_subdirectory(minimal)
endif()
-if(QT_FEATURE_freetype AND NOT ANDROID)
+if(QT_FEATURE_freetype AND NOT ANDROID AND NOT WASM)
add_subdirectory(offscreen)
endif()
if(QT_FEATURE_xcb)
diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt
index 3a330e2b7b..24a93677a2 100644
--- a/src/plugins/platforms/ios/CMakeLists.txt
+++ b/src/plugins/platforms/ios/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Generated from ios.pro.
+# Generated from kernel.pro.
#####################################################################
## QIOSIntegrationPlugin Plugin:
@@ -32,13 +32,15 @@ add_qt_plugin(QIOSIntegrationPlugin
${FWQuartzCore}
${FWUIKit}
Qt::ClipboardSupportPrivate
+ Qt::Core
Qt::CorePrivate
Qt::FontDatabaseSupportPrivate
Qt::GraphicsSupportPrivate
+ Qt::Gui
Qt::GuiPrivate
)
-#### Keys ignored in scope 2:.:.:kernel.pro:<TRUE>:
+#### Keys ignored in scope 1:.:.:kernel.pro:<TRUE>:
# OTHER_FILES = "quiview_textinput.mm" "quiview_accessibility.mm"
## Scopes:
@@ -52,6 +54,7 @@ extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSuppo
extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
SOURCES
qiosclipboard.h qiosclipboard.mm
+ qiosdocumentpickercontroller.h qiosdocumentpickercontroller.mm
qiosfiledialog.h qiosfiledialog.mm
qiosmenu.h qiosmenu.mm
qiosmessagedialog.h qiosmessagedialog.mm
@@ -60,6 +63,5 @@ extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
${FWAssetsLibrary}
)
-#### Keys ignored in scope 6:.:.:kernel.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 5:.:.:kernel.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"
-add_subdirectory(optional)
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt
index d4df972715..b2ecf9d657 100644
--- a/src/tools/bootstrap/.prev_CMakeLists.txt
+++ b/src/tools/bootstrap/.prev_CMakeLists.txt
@@ -167,8 +167,7 @@ qt_extend_target(Bootstrap CONDITION APPLE
SOURCES
../../corelib/global/qoperatingsystemversion_darwin.mm
../../corelib/kernel/qcore_foundation.mm
- ../../corelib/kernel/qcore_mac.cpp
- ../../corelib/kernel/qcore_mac_objc.mm
+ ../../corelib/kernel/qcore_mac.mm
../../corelib/kernel/qcoreapplication_mac.cpp
PUBLIC_LIBRARIES
${FWFoundation}
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index 627847bd7f..b7367e2d26 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -167,8 +167,7 @@ qt_extend_target(Bootstrap CONDITION APPLE
SOURCES
../../corelib/global/qoperatingsystemversion_darwin.mm
../../corelib/kernel/qcore_foundation.mm
- ../../corelib/kernel/qcore_mac.cpp
- ../../corelib/kernel/qcore_mac_objc.mm
+ ../../corelib/kernel/qcore_mac.mm
../../corelib/kernel/qcoreapplication_mac.cpp
PUBLIC_LIBRARIES
${FWFoundation}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 10:12:22 +0000