1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-generate various CMake projects and configure after merge

Browse Source 
Change-Id: I02f5926c6664aab518c5c81e0c33dca0818a1871
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Simon Hausmann 2020-03-16 18:49:44 +01:00
parent c2f167b412
commit bc64ccbf00
12 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/widgets/tutorials/notepad/.prev_CMakeLists.txt
View File

@ -13,6 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/notepad")
find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Widgets)
add_qt_gui_executable(notepad add_qt_gui_executable(notepad
main.cpp main.cpp
@ -21,6 +22,7 @@ add_qt_gui_executable(notepad
target_link_libraries(notepad PUBLIC target_link_libraries(notepad PUBLIC
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::Widgets
) )

2
examples/widgets/tutorials/notepad/CMakeLists.txt
View File

@ -13,6 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/notepad")
find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Widgets)
find_package(Qt6 COMPONENTS PrintSupport) # special case: add find_package(Qt6 COMPONENTS PrintSupport) # special case: add
add_qt_gui_executable(notepad add_qt_gui_executable(notepad
@ -22,6 +23,7 @@ add_qt_gui_executable(notepad
target_link_libraries(notepad PUBLIC target_link_libraries(notepad PUBLIC
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::Widgets
) )

2
qmake/.prev_CMakeLists.txt
View File

@ -165,7 +165,7 @@ qt_extend_target(qmake CONDITION UNIX
qt_extend_target(qmake CONDITION MACOS qt_extend_target(qmake CONDITION MACOS
SOURCES SOURCES
qcore_foundation.mm qcore_foundation.mm
qcore_mac.cpp qcore_mac.mm
qoperatingsystemversion_darwin.mm qoperatingsystemversion_darwin.mm
qsettings_mac.cpp qsettings_mac.cpp
PUBLIC_LIBRARIES PUBLIC_LIBRARIES

2
qmake/CMakeLists.txt
View File

@ -168,7 +168,7 @@ qt_extend_target(qmake CONDITION UNIX
qt_extend_target(qmake CONDITION MACOS qt_extend_target(qmake CONDITION MACOS
SOURCES SOURCES
../src/corelib/kernel/qcore_foundation.mm # special case ../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/global/qoperatingsystemversion_darwin.mm # special case
../src/corelib/io/qsettings_mac.cpp # special case ../src/corelib/io/qsettings_mac.cpp # special case
PUBLIC_LIBRARIES PUBLIC_LIBRARIES

3
src/corelib/.prev_CMakeLists.txt
View File

@ -392,8 +392,7 @@ qt_extend_target(Core CONDITION APPLE
io/qstorageinfo_mac.cpp io/qstorageinfo_mac.cpp
kernel/qcfsocketnotifier.cpp kernel/qcfsocketnotifier_p.h kernel/qcfsocketnotifier.cpp kernel/qcfsocketnotifier_p.h
kernel/qcore_foundation.mm kernel/qcore_foundation.mm
kernel/qcore_mac.cpp kernel/qcore_mac_p.h kernel/qcore_mac.mm kernel/qcore_mac_p.h
kernel/qcore_mac_objc.mm
kernel/qcoreapplication_mac.cpp kernel/qcoreapplication_mac.cpp
kernel/qeventdispatcher_cf.mm kernel/qeventdispatcher_cf_p.h kernel/qeventdispatcher_cf.mm kernel/qeventdispatcher_cf_p.h
LIBRARIES LIBRARIES

3
src/corelib/CMakeLists.txt
View File

@ -502,8 +502,7 @@ qt_extend_target(Core CONDITION APPLE
io/qstorageinfo_mac.cpp io/qstorageinfo_mac.cpp
kernel/qcfsocketnotifier.cpp kernel/qcfsocketnotifier_p.h kernel/qcfsocketnotifier.cpp kernel/qcfsocketnotifier_p.h
kernel/qcore_foundation.mm kernel/qcore_foundation.mm
kernel/qcore_mac.cpp kernel/qcore_mac_p.h kernel/qcore_mac.mm kernel/qcore_mac_p.h
kernel/qcore_mac_objc.mm
kernel/qcoreapplication_mac.cpp kernel/qcoreapplication_mac.cpp
kernel/qeventdispatcher_cf.mm kernel/qeventdispatcher_cf_p.h kernel/qeventdispatcher_cf.mm kernel/qeventdispatcher_cf_p.h
LIBRARIES LIBRARIES

2
src/gui/configure.cmake
View File

@ -698,7 +698,7 @@ qt_feature("vsp2" PRIVATE
qt_feature("vnc" PRIVATE qt_feature("vnc" PRIVATE
SECTION "Platform plugins" SECTION "Platform plugins"
LABEL "VNC" 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 qt_feature("mtdev" PRIVATE
LABEL "mtdev" LABEL "mtdev"

4
src/plugins/platforms/.prev_CMakeLists.txt
View File

@ -3,10 +3,10 @@
if(ANDROID AND NOT ANDROID_EMBEDDED) if(ANDROID AND NOT ANDROID_EMBEDDED)
add_subdirectory(android) add_subdirectory(android)
endif() endif()
if(NOT ANDROID) if(NOT ANDROID AND NOT WASM)
add_subdirectory(minimal) add_subdirectory(minimal)
endif() endif()
if(QT_FEATURE_freetype AND NOT ANDROID) if(QT_FEATURE_freetype AND NOT ANDROID AND NOT WASM)
add_subdirectory(offscreen) add_subdirectory(offscreen)
endif() endif()
if(QT_FEATURE_xcb) if(QT_FEATURE_xcb)

4
src/plugins/platforms/CMakeLists.txt
View File

@ -3,10 +3,10 @@
if(ANDROID AND NOT ANDROID_EMBEDDED) if(ANDROID AND NOT ANDROID_EMBEDDED)
add_subdirectory(android) add_subdirectory(android)
endif() endif()
if(NOT ANDROID) if(NOT ANDROID AND NOT WASM)
add_subdirectory(minimal) add_subdirectory(minimal)
endif() endif()
if(QT_FEATURE_freetype AND NOT ANDROID) if(QT_FEATURE_freetype AND NOT ANDROID AND NOT WASM)
add_subdirectory(offscreen) add_subdirectory(offscreen)
endif() endif()
if(QT_FEATURE_xcb) if(QT_FEATURE_xcb)

10
src/plugins/platforms/ios/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Generated from ios.pro. # Generated from kernel.pro.
##################################################################### #####################################################################
## QIOSIntegrationPlugin Plugin: ## QIOSIntegrationPlugin Plugin:
@ -32,13 +32,15 @@ add_qt_plugin(QIOSIntegrationPlugin
${FWQuartzCore} ${FWQuartzCore}
${FWUIKit} ${FWUIKit}
Qt::ClipboardSupportPrivate Qt::ClipboardSupportPrivate
Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::FontDatabaseSupportPrivate Qt::FontDatabaseSupportPrivate
Qt::GraphicsSupportPrivate Qt::GraphicsSupportPrivate
Qt::Gui
Qt::GuiPrivate 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" # OTHER_FILES = "quiview_textinput.mm" "quiview_accessibility.mm"
## Scopes: ## Scopes:
@ -52,6 +54,7 @@ extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSuppo
extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
SOURCES SOURCES
qiosclipboard.h qiosclipboard.mm qiosclipboard.h qiosclipboard.mm
qiosdocumentpickercontroller.h qiosdocumentpickercontroller.mm
qiosfiledialog.h qiosfiledialog.mm qiosfiledialog.h qiosfiledialog.mm
qiosmenu.h qiosmenu.mm qiosmenu.h qiosmenu.mm
qiosmessagedialog.h qiosmessagedialog.mm qiosmessagedialog.h qiosmessagedialog.mm
@ -60,6 +63,5 @@ extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
${FWAssetsLibrary} ${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 = "-" # PLUGIN_EXTENDS = "-"
add_subdirectory(optional)

3
src/tools/bootstrap/.prev_CMakeLists.txt
View File

@ -167,8 +167,7 @@ qt_extend_target(Bootstrap CONDITION APPLE
SOURCES SOURCES
../../corelib/global/qoperatingsystemversion_darwin.mm ../../corelib/global/qoperatingsystemversion_darwin.mm
../../corelib/kernel/qcore_foundation.mm ../../corelib/kernel/qcore_foundation.mm
../../corelib/kernel/qcore_mac.cpp ../../corelib/kernel/qcore_mac.mm
../../corelib/kernel/qcore_mac_objc.mm
../../corelib/kernel/qcoreapplication_mac.cpp ../../corelib/kernel/qcoreapplication_mac.cpp
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
${FWFoundation} ${FWFoundation}

3
src/tools/bootstrap/CMakeLists.txt
View File

@ -167,8 +167,7 @@ qt_extend_target(Bootstrap CONDITION APPLE
SOURCES SOURCES
../../corelib/global/qoperatingsystemversion_darwin.mm ../../corelib/global/qoperatingsystemversion_darwin.mm
../../corelib/kernel/qcore_foundation.mm ../../corelib/kernel/qcore_foundation.mm
../../corelib/kernel/qcore_mac.cpp ../../corelib/kernel/qcore_mac.mm
../../corelib/kernel/qcore_mac_objc.mm
../../corelib/kernel/qcoreapplication_mac.cpp ../../corelib/kernel/qcoreapplication_mac.cpp
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
${FWFoundation} ${FWFoundation}