From 3b673994ea0311616db7022cef859705e25cdfab Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 18 Mar 2020 14:35:40 +0100 Subject: CMake: Regenerate projects after merge Plus additional adjustments. Change-Id: I0c2341ef6a5557e18df91b753f9e441c5b1a68e2 Reviewed-by: Simon Hausmann --- .prev_CMakeLists.txt | 4 +- src/.prev_CMakeLists.txt | 14 +++-- src/CMakeLists.txt | 27 ++++----- src/assistant/.prev_CMakeLists.txt | 9 +++ src/assistant/assistant/.prev_CMakeLists.txt | 8 +-- src/assistant/assistant/CMakeLists.txt | 8 +-- src/assistant/help/.prev_CMakeLists.txt | 68 ++++++++++++++++++++++ src/assistant/help/CMakeLists.txt | 12 ++++ src/assistant/qhelpgenerator/CMakeLists.txt | 4 +- src/designer/src/components/lib/CMakeLists.txt | 9 +-- src/designer/src/designer/CMakeLists.txt | 7 +-- src/designer/src/lib/CMakeLists.txt | 14 +++++ src/designer/src/plugins/activeqt/CMakeLists.txt | 9 ++- .../src/plugins/qquickwidget/CMakeLists.txt | 8 +-- src/designer/src/plugins/qwebview/CMakeLists.txt | 10 ++-- .../src/plugins/tools/view3d/CMakeLists.txt | 6 +- src/designer/src/uitools/CMakeLists.txt | 11 +++- src/distancefieldgenerator/CMakeLists.txt | 6 +- src/kmap2qmap/CMakeLists.txt | 4 +- src/linguist/CMakeLists.txt | 12 ++-- src/linguist/lconvert/.prev_CMakeLists.txt | 5 +- src/linguist/lconvert/CMakeLists.txt | 5 +- src/linguist/linguist/CMakeLists.txt | 10 ++-- src/linguist/lrelease/.prev_CMakeLists.txt | 5 +- src/linguist/lrelease/CMakeLists.txt | 5 +- src/linguist/lupdate/.prev_CMakeLists.txt | 11 ++-- src/linguist/lupdate/CMakeLists.txt | 11 ++-- src/makeqpf/CMakeLists.txt | 5 +- src/pixeltool/CMakeLists.txt | 5 +- src/qdbus/qdbus/CMakeLists.txt | 4 +- src/qdbus/qdbusviewer/CMakeLists.txt | 4 +- src/qdoc/.prev_CMakeLists.txt | 5 +- src/qdoc/CMakeLists.txt | 5 +- src/qtdiag/CMakeLists.txt | 5 +- src/windeployqt/.prev_CMakeLists.txt | 39 +++++++++++++ src/windeployqt/CMakeLists.txt | 4 +- tests/auto/.prev_CMakeLists.txt | 8 +-- tests/auto/CMakeLists.txt | 8 +-- tests/auto/qdoc/CMakeLists.txt | 3 +- tests/auto/qdoc/config/CMakeLists.txt | 16 +++++ tests/auto/qdoc/generatedoutput/CMakeLists.txt | 4 -- .../qdoccommandlineparser/.prev_CMakeLists.txt | 13 +++++ tests/auto/qdoc/utilities/CMakeLists.txt | 14 +++++ tests/auto/qhelpgenerator/CMakeLists.txt | 4 +- tests/auto/qhelpprojectdata/CMakeLists.txt | 4 +- 45 files changed, 296 insertions(+), 156 deletions(-) create mode 100644 src/assistant/.prev_CMakeLists.txt create mode 100644 src/assistant/help/.prev_CMakeLists.txt create mode 100644 src/windeployqt/.prev_CMakeLists.txt create mode 100644 tests/auto/qdoc/config/CMakeLists.txt create mode 100644 tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt create mode 100644 tests/auto/qdoc/utilities/CMakeLists.txt diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt index 5546e9a6d..0cdb4d696 100644 --- a/.prev_CMakeLists.txt +++ b/.prev_CMakeLists.txt @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.15.0) -project(tools_FIXME +project(QtTools VERSION 6.0.0 - DESCRIPTION "Qt tools_FIXME Libraries" + DESCRIPTION "Qt Tools Libraries" HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C ) diff --git a/src/.prev_CMakeLists.txt b/src/.prev_CMakeLists.txt index 08ee6c482..c6510b097 100644 --- a/src/.prev_CMakeLists.txt +++ b/src/.prev_CMakeLists.txt @@ -1,7 +1,6 @@ # Generated from src.pro. add_subdirectory(linguist) -add_subdirectory(qtattributionsscanner) add_subdirectory(global) if(QT_FEATURE_png AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets) add_subdirectory(assistant) @@ -11,16 +10,19 @@ endif() if(QT_FEATURE_png AND QT_FEATURE_thread AND QT_FEATURE_toolbutton AND TARGET Qt::Quick AND TARGET Qt::Widgets) add_subdirectory(distancefieldgenerator) endif() -if(QT_FEATURE_library AND (android_app OR NOT ANDROID)) +if(QT_FEATURE_commandlineparser) + add_subdirectory(qtattributionsscanner) +endif() +if(QT_FEATURE_commandlineparser AND QT_FEATURE_library AND (android_app OR NOT ANDROID)) add_subdirectory(qtplugininfo) endif() -if(QT_FEATURE_clang AND QT_FEATURE_thread) +if(QT_FEATURE_clang AND QT_FEATURE_commandlineparser AND QT_FEATURE_thread) add_subdirectory(qdoc) endif() -if(android_app OR NOT ANDROID) +if(android_app OR (QT_FEATURE_commandlineparser AND NOT ANDROID)) add_subdirectory(qtpaths) endif() -if(APPLE_OSX) +if(MACOS) add_subdirectory(macdeployqt) endif() if(TARGET Qt::DBus) @@ -32,6 +34,6 @@ endif() if(WINRT) add_subdirectory(winrtrunner) endif() -if(TARGET Qt::Gui AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT QNX AND NOT WASM AND NOT WINRT) +if(QT_FEATURE_commandlineparser AND TARGET Qt::Gui AND NOT ANDROID AND NOT QNX AND NOT UIKIT AND NOT WASM AND NOT WINRT) add_subdirectory(qtdiag) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a06b7e17c..ada59be6a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,8 @@ # Generated from src.pro. -add_subdirectory(global) +add_subdirectory(global) # special case add as first directory add_subdirectory(linguist) -add_subdirectory(qtattributionsscanner) +# add_subdirectory(global) # special case remove if(QT_FEATURE_png AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets) add_subdirectory(assistant) add_subdirectory(designer) @@ -11,26 +11,19 @@ endif() if(QT_FEATURE_png AND QT_FEATURE_thread AND QT_FEATURE_toolbutton AND TARGET Qt::Quick AND TARGET Qt::Widgets) add_subdirectory(distancefieldgenerator) endif() -if(QT_FEATURE_library AND (android_app OR NOT ANDROID)) +if(QT_FEATURE_commandlineparser) + add_subdirectory(qtattributionsscanner) +endif() +if(QT_FEATURE_commandlineparser AND QT_FEATURE_library AND (android_app OR NOT ANDROID)) add_subdirectory(qtplugininfo) endif() -# special case begin -qt_feature_module_begin( - NO_MODULE - PUBLIC_FILE "qdoc/qtqdoc-config.h" - PRIVATE_FILE "qdoc/qtqdoc-config_p.h" -) -include(qdoc/configure.cmake) -qt_feature_module_end(NO_MODULE) -# special case end - -if(QT_FEATURE_qdoc AND QT_FEATURE_thread) +if(QT_FEATURE_clang AND QT_FEATURE_commandlineparser AND QT_FEATURE_thread) add_subdirectory(qdoc) endif() -if(android_app OR NOT ANDROID) +if(android_app OR (QT_FEATURE_commandlineparser AND NOT ANDROID)) add_subdirectory(qtpaths) endif() -if(APPLE_OSX) +if(MACOS) add_subdirectory(macdeployqt) endif() if(TARGET Qt::DBus) @@ -42,6 +35,6 @@ endif() if(WINRT) add_subdirectory(winrtrunner) endif() -if(TARGET Qt::Gui AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT QNX AND NOT WASM AND NOT WINRT) +if(QT_FEATURE_commandlineparser AND TARGET Qt::Gui AND NOT ANDROID AND NOT QNX AND NOT UIKIT AND NOT WASM AND NOT WINRT) add_subdirectory(qtdiag) endif() diff --git a/src/assistant/.prev_CMakeLists.txt b/src/assistant/.prev_CMakeLists.txt new file mode 100644 index 000000000..9d932742e --- /dev/null +++ b/src/assistant/.prev_CMakeLists.txt @@ -0,0 +1,9 @@ +# Generated from assistant.pro. + +if(NOT TARGET Qt::Sql) + return() +endif() +add_subdirectory(help) +add_subdirectory(assistant) +add_subdirectory(qhelpgenerator) +add_subdirectory(qcollectiongenerator) diff --git a/src/assistant/assistant/.prev_CMakeLists.txt b/src/assistant/assistant/.prev_CMakeLists.txt index 3c3d5849c..3fccf245b 100644 --- a/src/assistant/assistant/.prev_CMakeLists.txt +++ b/src/assistant/assistant/.prev_CMakeLists.txt @@ -20,10 +20,11 @@ qt_add_executable(assistant centralwidget.cpp centralwidget.h cmdlineparser.cpp cmdlineparser.h contentwindow.cpp contentwindow.h - filternamedialog.cpp filternamedialog.h filternamedialog.ui findwidget.cpp findwidget.h globalactions.cpp globalactions.h helpbrowsersupport.cpp helpbrowsersupport.h + helpdocsettings.cpp helpdocsettings.h + helpdocsettingswidget.cpp helpdocsettingswidget.h helpdocsettingswidget.ui helpenginewrapper.cpp helpenginewrapper.h helpviewer.cpp helpviewer.h helpviewer_p.h indexwindow.cpp indexwindow.h @@ -33,7 +34,6 @@ qt_add_executable(assistant openpagesmodel.cpp openpagesmodel.h openpagesswitcher.cpp openpagesswitcher.h openpageswidget.cpp openpageswidget.h - optionswidget.cpp optionswidget.h preferencesdialog.cpp preferencesdialog.h preferencesdialog.ui qtdocinstaller.cpp qtdocinstaller.h remotecontrol.cpp remotecontrol.h @@ -76,9 +76,7 @@ set(assistant_images_resource_files "images/mac/editcopy.png" "images/mac/find.png" "images/mac/home.png" - "images/mac/minus.png" "images/mac/next.png" - "images/mac/plus.png" "images/mac/previous.png" "images/mac/print.png" "images/mac/resetzoom.png" @@ -91,9 +89,7 @@ set(assistant_images_resource_files "images/win/editcopy.png" "images/win/find.png" "images/win/home.png" - "images/win/minus.png" "images/win/next.png" - "images/win/plus.png" "images/win/previous.png" "images/win/print.png" "images/win/resetzoom.png" diff --git a/src/assistant/assistant/CMakeLists.txt b/src/assistant/assistant/CMakeLists.txt index a2ded6fdc..196eed867 100644 --- a/src/assistant/assistant/CMakeLists.txt +++ b/src/assistant/assistant/CMakeLists.txt @@ -20,10 +20,11 @@ qt_add_executable(assistant centralwidget.cpp centralwidget.h cmdlineparser.cpp cmdlineparser.h contentwindow.cpp contentwindow.h - filternamedialog.cpp filternamedialog.h filternamedialog.ui findwidget.cpp findwidget.h globalactions.cpp globalactions.h helpbrowsersupport.cpp helpbrowsersupport.h + helpdocsettings.cpp helpdocsettings.h + helpdocsettingswidget.cpp helpdocsettingswidget.h helpdocsettingswidget.ui helpenginewrapper.cpp helpenginewrapper.h helpviewer.cpp helpviewer.h helpviewer_p.h indexwindow.cpp indexwindow.h @@ -33,7 +34,6 @@ qt_add_executable(assistant openpagesmodel.cpp openpagesmodel.h openpagesswitcher.cpp openpagesswitcher.h openpageswidget.cpp openpageswidget.h - optionswidget.cpp optionswidget.h preferencesdialog.cpp preferencesdialog.h preferencesdialog.ui qtdocinstaller.cpp qtdocinstaller.h remotecontrol.cpp remotecontrol.h @@ -77,9 +77,7 @@ set(assistant_images_resource_files "images/mac/editcopy.png" "images/mac/find.png" "images/mac/home.png" - "images/mac/minus.png" "images/mac/next.png" - "images/mac/plus.png" "images/mac/previous.png" "images/mac/print.png" "images/mac/resetzoom.png" @@ -92,9 +90,7 @@ set(assistant_images_resource_files "images/win/editcopy.png" "images/win/find.png" "images/win/home.png" - "images/win/minus.png" "images/win/next.png" - "images/win/plus.png" "images/win/previous.png" "images/win/print.png" "images/win/resetzoom.png" diff --git a/src/assistant/help/.prev_CMakeLists.txt b/src/assistant/help/.prev_CMakeLists.txt new file mode 100644 index 000000000..f6c0622e0 --- /dev/null +++ b/src/assistant/help/.prev_CMakeLists.txt @@ -0,0 +1,68 @@ +# Generated from help.pro. + +##################################################################### +## Help Module: +##################################################################### + +qt_add_module(Help + SOURCES + qcompressedhelpinfo.cpp qcompressedhelpinfo.h + qfilternamedialog.cpp qfilternamedialog.ui qfilternamedialog_p.h + qhelp_global.cpp qhelp_global.h + qhelpcollectionhandler.cpp qhelpcollectionhandler_p.h + qhelpcontentwidget.cpp qhelpcontentwidget.h + qhelpdbreader.cpp qhelpdbreader_p.h + qhelpengine.cpp qhelpengine.h qhelpengine_p.h + qhelpenginecore.cpp qhelpenginecore.h + qhelpfilterdata.cpp qhelpfilterdata.h + qhelpfilterengine.cpp qhelpfilterengine.h + qhelpfiltersettings.cpp qhelpfiltersettings_p.h + qhelpfiltersettingswidget.cpp qhelpfiltersettingswidget.h qhelpfiltersettingswidget.ui + qhelpindexwidget.cpp qhelpindexwidget.h + qhelpsearchengine.cpp qhelpsearchengine.h + qhelpsearchindexreader.cpp qhelpsearchindexreader_p.h + qhelpsearchindexreader_default.cpp qhelpsearchindexreader_default_p.h + qhelpsearchindexwriter_default.cpp qhelpsearchindexwriter_default_p.h + qhelpsearchquerywidget.cpp qhelpsearchquerywidget.h + qhelpsearchresultwidget.cpp qhelpsearchresultwidget.h + qoptionswidget.cpp qoptionswidget_p.h + DEFINES + -QT_ASCII_CAST_WARNINGS + QHELP_LIB + LIBRARIES + Qt::CorePrivate + Qt::Network + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::Sql + Qt::Widgets + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + ENABLE_AUTOGEN_TOOLS + uic +) + +# Resources: +set(helpsystem_resource_files + "images/1leftarrow.png" + "images/1rightarrow.png" + "images/3leftarrow.png" + "images/3rightarrow.png" + "images/mac/minus.png" + "images/mac/plus.png" + "images/win/minus.png" + "images/win/plus.png" +) + +qt_add_resource(Help "helpsystem" + PREFIX + "/qt-project.org/assistant" + FILES + ${helpsystem_resource_files} +) + +qt_add_docs(Help + doc/qthelp.qdocconf +) + diff --git a/src/assistant/help/CMakeLists.txt b/src/assistant/help/CMakeLists.txt index eb2589a5d..1701e6781 100644 --- a/src/assistant/help/CMakeLists.txt +++ b/src/assistant/help/CMakeLists.txt @@ -7,6 +7,7 @@ qt_add_module(Help SOURCES qcompressedhelpinfo.cpp qcompressedhelpinfo.h + qfilternamedialog.cpp qfilternamedialog.ui qfilternamedialog_p.h qhelp_global.cpp qhelp_global.h qhelpcollectionhandler.cpp qhelpcollectionhandler_p.h qhelpcontentwidget.cpp qhelpcontentwidget.h @@ -15,6 +16,8 @@ qt_add_module(Help qhelpenginecore.cpp qhelpenginecore.h qhelpfilterdata.cpp qhelpfilterdata.h qhelpfilterengine.cpp qhelpfilterengine.h + qhelpfiltersettings.cpp qhelpfiltersettings_p.h + qhelpfiltersettingswidget.cpp qhelpfiltersettingswidget.h qhelpfiltersettingswidget.ui qhelpindexwidget.cpp qhelpindexwidget.h qhelpsearchengine.cpp qhelpsearchengine.h qhelpsearchindexreader.cpp qhelpsearchindexreader_p.h @@ -22,6 +25,7 @@ qt_add_module(Help qhelpsearchindexwriter_default.cpp qhelpsearchindexwriter_default_p.h qhelpsearchquerywidget.cpp qhelpsearchquerywidget.h qhelpsearchresultwidget.cpp qhelpsearchresultwidget.h + qoptionswidget.cpp qoptionswidget_p.h DEFINES # -QT_ASCII_CAST_WARNINGS # special case remove QHELP_LIB @@ -33,6 +37,10 @@ qt_add_module(Help Qt::Gui Qt::Sql Qt::Widgets + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + ENABLE_AUTOGEN_TOOLS + uic ) # Resources: @@ -41,6 +49,10 @@ set(helpsystem_resource_files "images/1rightarrow.png" "images/3leftarrow.png" "images/3rightarrow.png" + "images/mac/minus.png" + "images/mac/plus.png" + "images/win/minus.png" + "images/win/plus.png" ) qt_add_resource(Help "helpsystem" diff --git a/src/assistant/qhelpgenerator/CMakeLists.txt b/src/assistant/qhelpgenerator/CMakeLists.txt index 564edd5eb..a9653d99f 100644 --- a/src/assistant/qhelpgenerator/CMakeLists.txt +++ b/src/assistant/qhelpgenerator/CMakeLists.txt @@ -12,11 +12,9 @@ qt_add_tool(qhelpgenerator main.cpp qhelpdatainterface.cpp qhelpdatainterface_p.h qhelpprojectdata.cpp qhelpprojectdata_p.h - LIBRARIES - Qt::HelpPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::Help + Qt::HelpPrivate Qt::Network ) diff --git a/src/designer/src/components/lib/CMakeLists.txt b/src/designer/src/components/lib/CMakeLists.txt index da3f062ca..c094b756d 100644 --- a/src/designer/src/components/lib/CMakeLists.txt +++ b/src/designer/src/components/lib/CMakeLists.txt @@ -112,15 +112,12 @@ qt_add_module(DesignerComponents ../taskmenu ../widgetbox LIBRARIES - Qt::DesignerPrivate - Qt::GuiPrivate - Qt::WidgetsPrivate Qt::Xml PUBLIC_LIBRARIES Qt::Core - Qt::Designer - Qt::Gui - Qt::Widgets + Qt::DesignerPrivate + Qt::GuiPrivate + Qt::WidgetsPrivate Qt::Xml ENABLE_AUTOGEN_TOOLS uic diff --git a/src/designer/src/designer/CMakeLists.txt b/src/designer/src/designer/CMakeLists.txt index 2731cfa2d..be0ea16f1 100644 --- a/src/designer/src/designer/CMakeLists.txt +++ b/src/designer/src/designer/CMakeLists.txt @@ -33,13 +33,10 @@ qt_add_executable(designer ../lib/sdk ../lib/shared extra - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DesignerComponentsPrivate Qt::DesignerPrivate - PUBLIC_LIBRARIES - Qt::Designer - Qt::DesignerComponents Qt::Gui Qt::Network Qt::Widgets @@ -128,7 +125,7 @@ qt_extend_target(designer CONDITION QT_CONFIG___contains___static # QMAKE_BUNDLE_DATA = "FILETYPES" # QMAKE_INFO_PLIST = "Info_mac.plist" -qt_extend_target(designer CONDITION UNIX AND NOT APPLE_OSX AND NOT HAIKU +qt_extend_target(designer CONDITION UNIX AND NOT HAIKU AND NOT MACOS PUBLIC_LIBRARIES m ) diff --git a/src/designer/src/lib/CMakeLists.txt b/src/designer/src/lib/CMakeLists.txt index 323e190be..24df4582a 100644 --- a/src/designer/src/lib/CMakeLists.txt +++ b/src/designer/src/lib/CMakeLists.txt @@ -170,6 +170,10 @@ qt_add_module(Designer Qt::UiPlugin Qt::Widgets Qt::Xml + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate + Qt::WidgetsPrivate ENABLE_AUTOGEN_TOOLS uic PRECOMPILED_HEADER @@ -444,6 +448,11 @@ qt_add_resource(Designer "shared" ## Scopes: ##################################################################### +qt_extend_target(Designer CONDITION TARGET Qt::OpenGLWidgets + PUBLIC_LIBRARIES + Qt::OpenGLWidgets +) + qt_extend_target(Designer CONDITION static DEFINES QT_DESIGNER_STATIC @@ -556,3 +565,8 @@ qt_extend_target(Designer CONDITION QT_BUILD_SHARED_LIBS INCLUDE_DIRECTORIES ../../../shared/qtpropertybrowser ) + +qt_extend_target(Designer CONDITION QT_FEATURE_opengl + LIBRARIES + Qt::OpenGL +) diff --git a/src/designer/src/plugins/activeqt/CMakeLists.txt b/src/designer/src/plugins/activeqt/CMakeLists.txt index dbeef1cf5..f7e39b759 100644 --- a/src/designer/src/plugins/activeqt/CMakeLists.txt +++ b/src/designer/src/plugins/activeqt/CMakeLists.txt @@ -1,24 +1,23 @@ # Generated from activeqt.pro. ##################################################################### -## qaxwidget Plugin: +## QAxWidgetPlugin Plugin: ##################################################################### -qt_add_plugin(qaxwidget +qt_add_plugin(QAxWidgetPlugin + OUTPUT_NAME qaxwidget TYPE designer - CLASS_NAME QAxWidgetPlugin SOURCES qaxwidgetextrainfo.cpp qaxwidgetextrainfo.h qaxwidgetplugin.cpp qaxwidgetplugin.h qaxwidgetpropertysheet.cpp qaxwidgetpropertysheet.h qaxwidgettaskmenu.cpp qaxwidgettaskmenu.h qdesigneraxwidget.cpp qdesigneraxwidget.h - LIBRARIES - Qt::DesignerPrivate PUBLIC_LIBRARIES Qt::AxContainer Qt::Core Qt::Designer + Qt::DesignerPrivate Qt::Gui Qt::Widgets ) diff --git a/src/designer/src/plugins/qquickwidget/CMakeLists.txt b/src/designer/src/plugins/qquickwidget/CMakeLists.txt index f379e7a39..dc726733f 100644 --- a/src/designer/src/plugins/qquickwidget/CMakeLists.txt +++ b/src/designer/src/plugins/qquickwidget/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from qquickwidget.pro. ##################################################################### -## qquickwidget Plugin: +## QQuickWidgetPlugin Plugin: ##################################################################### -qt_add_plugin(qquickwidget +qt_add_plugin(QQuickWidgetPlugin + OUTPUT_NAME qquickwidget TYPE designer - CLASS_NAME QQuickWidgetPlugin SOURCES qquickwidget_plugin.cpp qquickwidget_plugin.h PUBLIC_LIBRARIES @@ -22,7 +22,7 @@ set(qquickwidget_plugin_resource_files "images/qquickwidget.png" ) -qt_add_resource(qquickwidget "qquickwidget_plugin" +qt_add_resource(QQuickWidgetPlugin "qquickwidget_plugin" PREFIX "/qt-project.org/qquickwidget" FILES diff --git a/src/designer/src/plugins/qwebview/CMakeLists.txt b/src/designer/src/plugins/qwebview/CMakeLists.txt index 120c9dcf3..a0bad48f2 100644 --- a/src/designer/src/plugins/qwebview/CMakeLists.txt +++ b/src/designer/src/plugins/qwebview/CMakeLists.txt @@ -1,20 +1,20 @@ # Generated from qwebview.pro. ##################################################################### -## qwebview Plugin: +## QWebViewPlugin Plugin: ##################################################################### -qt_add_plugin(qwebview +qt_add_plugin(QWebViewPlugin + OUTPUT_NAME qwebview TYPE designer - CLASS_NAME QWebViewPlugin SOURCES qwebview_plugin.cpp qwebview_plugin.h PUBLIC_LIBRARIES Qt::Core Qt::Designer Qt::Gui + Qt::WebKitWidgets Qt::Widgets - webkitwidgets ) # Resources: @@ -22,7 +22,7 @@ set(qwebview_plugin_resource_files "images/qwebview.png" ) -qt_add_resource(qwebview "qwebview_plugin" +qt_add_resource(QWebViewPlugin "qwebview_plugin" PREFIX "/qt-project.org/qwebview" FILES diff --git a/src/designer/src/plugins/tools/view3d/CMakeLists.txt b/src/designer/src/plugins/tools/view3d/CMakeLists.txt index b5424190f..89585683c 100644 --- a/src/designer/src/plugins/tools/view3d/CMakeLists.txt +++ b/src/designer/src/plugins/tools/view3d/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from view3d.pro. ##################################################################### -## view3d Plugin: +## QView3DPlugin Plugin: ##################################################################### -qt_add_plugin(view3d +qt_add_plugin(QView3DPlugin + OUTPUT_NAME view3d TYPE designer - CLASS_NAME QView3DPlugin SOURCES view3d.cpp view3d.h view3d_global.h diff --git a/src/designer/src/uitools/CMakeLists.txt b/src/designer/src/uitools/CMakeLists.txt index 5babb212f..c377da211 100644 --- a/src/designer/src/uitools/CMakeLists.txt +++ b/src/designer/src/uitools/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### qt_add_module(UiTools - STATIC SOURCES ../lib/uilib/abstractformbuilder.cpp ../lib/uilib/abstractformbuilder.h ../lib/uilib/formbuilder.cpp ../lib/uilib/formbuilder.h @@ -32,6 +31,16 @@ qt_add_module(UiTools ## Scopes: ##################################################################### + +qt_extend_target(UiTools CONDITION TARGET Qt::OpenGLWidgets + PUBLIC_LIBRARIES + Qt::OpenGLWidgets +) + +qt_extend_target(UiTools CONDITION QT_FEATURE_opengl + LIBRARIES + Qt::OpenGL +) qt_add_docs(UiTools doc/qtuitools.qdocconf ) diff --git a/src/distancefieldgenerator/CMakeLists.txt b/src/distancefieldgenerator/CMakeLists.txt index 0648f8cf4..45e1cf1da 100644 --- a/src/distancefieldgenerator/CMakeLists.txt +++ b/src/distancefieldgenerator/CMakeLists.txt @@ -15,13 +15,11 @@ qt_add_executable(qdistancefieldgenerator QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Quick Qt::Widgets ENABLE_AUTOGEN_TOOLS uic diff --git a/src/kmap2qmap/CMakeLists.txt b/src/kmap2qmap/CMakeLists.txt index 3ef95a124..f2c301d00 100644 --- a/src/kmap2qmap/CMakeLists.txt +++ b/src/kmap2qmap/CMakeLists.txt @@ -7,8 +7,6 @@ qt_add_executable(kmap2qmap SOURCES main.cpp - LIBRARIES - Qt::InputSupportPrivate PUBLIC_LIBRARIES - Qt::InputSupport + Qt::InputSupportPrivate ) diff --git a/src/linguist/CMakeLists.txt b/src/linguist/CMakeLists.txt index 28b3f96a6..2c2f2b712 100644 --- a/src/linguist/CMakeLists.txt +++ b/src/linguist/CMakeLists.txt @@ -6,11 +6,11 @@ add_subdirectory(lrelease) add_subdirectory(lrelease-pro) add_subdirectory(lupdate) add_subdirectory(lupdate-pro) -# special case begin TODO -#if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png) -# add_subdirectory(linguist) -#endif() -# special case end +if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png) + add_subdirectory(linguist) +endif() +# special case begin # Create a fake module that would emulate the Qt5::LinguistTools CMake Config package -add_qt_module(Linguist NO_MODULE_HEADERS HEADER_MODULE) # special case +add_qt_module(Linguist NO_MODULE_HEADERS HEADER_MODULE) +# special case end diff --git a/src/linguist/lconvert/.prev_CMakeLists.txt b/src/linguist/lconvert/.prev_CMakeLists.txt index 6a47b65fb..e65bc854d 100644 --- a/src/linguist/lconvert/.prev_CMakeLists.txt +++ b/src/linguist/lconvert/.prev_CMakeLists.txt @@ -14,16 +14,15 @@ qt_add_tool(lconvert ../shared/translatormessage.cpp ../shared/translatormessage.h ../shared/ts.cpp ../shared/xliff.cpp + ../shared/xmlparser.cpp ../shared/xmlparser.h main.cpp DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES - Qt::Xml + Qt::CorePrivate ) #### Keys ignored in scope 1:.:.:lconvert.pro:: diff --git a/src/linguist/lconvert/CMakeLists.txt b/src/linguist/lconvert/CMakeLists.txt index 1b873965f..a5dee94d6 100644 --- a/src/linguist/lconvert/CMakeLists.txt +++ b/src/linguist/lconvert/CMakeLists.txt @@ -15,16 +15,15 @@ qt_add_tool(lconvert ../shared/translatormessage.cpp ../shared/translatormessage.h ../shared/ts.cpp ../shared/xliff.cpp + ../shared/xmlparser.cpp ../shared/xmlparser.h main.cpp DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES - Qt::Xml + Qt::CorePrivate ) #### Keys ignored in scope 1:.:.:lconvert.pro:: diff --git a/src/linguist/linguist/CMakeLists.txt b/src/linguist/linguist/CMakeLists.txt index 8d6d42700..4e32082c3 100644 --- a/src/linguist/linguist/CMakeLists.txt +++ b/src/linguist/linguist/CMakeLists.txt @@ -16,6 +16,7 @@ qt_add_executable(linguist ../shared/translatormessage.cpp ../shared/translatormessage.h ../shared/ts.cpp ../shared/xliff.cpp + ../shared/xmlparser.cpp ../shared/xmlparser.h batchtranslation.ui batchtranslationdialog.cpp batchtranslationdialog.h errorsview.cpp errorsview.h @@ -46,16 +47,13 @@ qt_add_executable(linguist QT_NO_CAST_TO_ASCII INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::UiToolsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::PrintSupport - Qt::UiTools + Qt::UiToolsPrivate Qt::Widgets - Qt::Xml ENABLE_AUTOGEN_TOOLS uic ) diff --git a/src/linguist/lrelease/.prev_CMakeLists.txt b/src/linguist/lrelease/.prev_CMakeLists.txt index 307cef82d..b0f636edc 100644 --- a/src/linguist/lrelease/.prev_CMakeLists.txt +++ b/src/linguist/lrelease/.prev_CMakeLists.txt @@ -16,16 +16,15 @@ qt_add_tool(lrelease ../shared/translatormessage.cpp ../shared/translatormessage.h ../shared/ts.cpp ../shared/xliff.cpp + ../shared/xmlparser.cpp ../shared/xmlparser.h main.cpp DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES - Qt::Xml + Qt::CorePrivate ) #### Keys ignored in scope 1:.:.:lrelease.pro:: diff --git a/src/linguist/lrelease/CMakeLists.txt b/src/linguist/lrelease/CMakeLists.txt index 009f47d3c..22e1dee2e 100644 --- a/src/linguist/lrelease/CMakeLists.txt +++ b/src/linguist/lrelease/CMakeLists.txt @@ -17,16 +17,15 @@ qt_add_tool(lrelease ../shared/translatormessage.cpp ../shared/translatormessage.h ../shared/ts.cpp ../shared/xliff.cpp + ../shared/xmlparser.cpp ../shared/xmlparser.h main.cpp DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES - Qt::Xml + Qt::CorePrivate ) #### Keys ignored in scope 1:.:.:lrelease.pro:: diff --git a/src/linguist/lupdate/.prev_CMakeLists.txt b/src/linguist/lupdate/.prev_CMakeLists.txt index f14ce2f77..a1535eff0 100644 --- a/src/linguist/lupdate/.prev_CMakeLists.txt +++ b/src/linguist/lupdate/.prev_CMakeLists.txt @@ -18,6 +18,7 @@ qt_add_tool(lupdate ../shared/translatormessage.cpp ../shared/translatormessage.h ../shared/ts.cpp ../shared/xliff.cpp + ../shared/xmlparser.cpp ../shared/xmlparser.h cpp.cpp cpp.h java.cpp lupdate.h @@ -29,12 +30,9 @@ qt_add_tool(lupdate QT_NO_CAST_TO_ASCII INCLUDE_DIRECTORIES ../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::ToolsPrivate - PUBLIC_LIBRARIES - Qt::Tools - Qt::Xml ) #### Keys ignored in scope 1:.:.:lupdate.pro:: @@ -50,10 +48,8 @@ qt_add_tool(lupdate qt_extend_target(lupdate CONDITION TARGET Qt::QmlDevToolsPrivate SOURCES qdeclarative.cpp - LIBRARIES - Qt::QmlDevToolsPrivate PUBLIC_LIBRARIES - Qt::QmlDevTools + Qt::QmlDevToolsPrivate ) qt_extend_target(lupdate CONDITION NOT TARGET Qt::QmlDevToolsPrivate @@ -65,6 +61,7 @@ qt_extend_target(lupdate CONDITION QT_FEATURE_clangcpp SOURCES clangtoolastreader.cpp clangtoolastreader.h cpp_clang.cpp cpp_clang.h + lupdatepreprocessoraction.cpp lupdatepreprocessoraction.h DEFINES (CLANG_RESOURCE_DIR=\"/clang//include\") (LUPDATE_CLANG_VERSION_STR=\"\") diff --git a/src/linguist/lupdate/CMakeLists.txt b/src/linguist/lupdate/CMakeLists.txt index 4f1fc7375..d9c6ffa79 100644 --- a/src/linguist/lupdate/CMakeLists.txt +++ b/src/linguist/lupdate/CMakeLists.txt @@ -19,6 +19,7 @@ qt_add_tool(lupdate ../shared/translatormessage.cpp ../shared/translatormessage.h ../shared/ts.cpp ../shared/xliff.cpp + ../shared/xmlparser.cpp ../shared/xmlparser.h cpp.cpp cpp.h java.cpp lupdate.h @@ -30,12 +31,9 @@ qt_add_tool(lupdate QT_NO_CAST_TO_ASCII INCLUDE_DIRECTORIES ../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::ToolsPrivate - PUBLIC_LIBRARIES - Qt::Tools - Qt::Xml ) #### Keys ignored in scope 1:.:.:lupdate.pro:: @@ -51,10 +49,8 @@ qt_add_tool(lupdate qt_extend_target(lupdate CONDITION TARGET Qt::QmlDevToolsPrivate SOURCES qdeclarative.cpp - LIBRARIES - Qt::QmlDevToolsPrivate PUBLIC_LIBRARIES - Qt::QmlDevTools + Qt::QmlDevToolsPrivate ) qt_extend_target(lupdate CONDITION NOT TARGET Qt::QmlDevToolsPrivate @@ -66,6 +62,7 @@ qt_extend_target(lupdate CONDITION QT_FEATURE_clangcpp SOURCES clangtoolastreader.cpp clangtoolastreader.h cpp_clang.cpp cpp_clang.h + lupdatepreprocessoraction.cpp lupdatepreprocessoraction.h DEFINES # special case begin # remove these diff --git a/src/makeqpf/CMakeLists.txt b/src/makeqpf/CMakeLists.txt index 0e1466b48..57f80dfd1 100644 --- a/src/makeqpf/CMakeLists.txt +++ b/src/makeqpf/CMakeLists.txt @@ -12,11 +12,10 @@ qt_add_executable(makeqpf DEFINES QT_DISABLE_DEPRECATED_BEFORE=0 QT_NO_FREETYPE - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets ENABLE_AUTOGEN_TOOLS uic diff --git a/src/pixeltool/CMakeLists.txt b/src/pixeltool/CMakeLists.txt index e6ee7f507..e72b598f7 100644 --- a/src/pixeltool/CMakeLists.txt +++ b/src/pixeltool/CMakeLists.txt @@ -9,11 +9,10 @@ qt_add_executable(pixeltool SOURCES main.cpp qpixeltool.cpp qpixeltool.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/src/qdbus/qdbus/CMakeLists.txt b/src/qdbus/qdbus/CMakeLists.txt index 7c1bab3ed..0ab4c32f9 100644 --- a/src/qdbus/qdbus/CMakeLists.txt +++ b/src/qdbus/qdbus/CMakeLists.txt @@ -8,10 +8,8 @@ qt_add_executable(qdbus GUI SOURCES qdbus.cpp - LIBRARIES - Qt::DBusPrivate PUBLIC_LIBRARIES - Qt::DBus + Qt::DBusPrivate Qt::Xml ) diff --git a/src/qdbus/qdbusviewer/CMakeLists.txt b/src/qdbus/qdbusviewer/CMakeLists.txt index 101107c08..64fbc27e3 100644 --- a/src/qdbus/qdbusviewer/CMakeLists.txt +++ b/src/qdbus/qdbusviewer/CMakeLists.txt @@ -14,10 +14,8 @@ qt_add_executable(qdbusviewer qdbusmodel.cpp qdbusmodel.h qdbusviewer.cpp qdbusviewer.h servicesproxymodel.cpp servicesproxymodel.h - LIBRARIES - Qt::DBusPrivate PUBLIC_LIBRARIES - Qt::DBus + Qt::DBusPrivate Qt::Gui Qt::Widgets Qt::Xml diff --git a/src/qdoc/.prev_CMakeLists.txt b/src/qdoc/.prev_CMakeLists.txt index b56fe5b08..e77dddb70 100644 --- a/src/qdoc/.prev_CMakeLists.txt +++ b/src/qdoc/.prev_CMakeLists.txt @@ -15,6 +15,7 @@ qt_add_tool(qdoc cppcodemarker.cpp cppcodemarker.h cppcodeparser.cpp cppcodeparser.h doc.cpp doc.h + docbookgenerator.cpp docbookgenerator.h editdistance.cpp editdistance.h generator.cpp generator.h helpprojectwriter.cpp helpprojectwriter.h @@ -78,10 +79,8 @@ qt_add_tool(qdoc # _REQUIREMENTS = "qtConfig(xmlstreamwriter)" qt_extend_target(qdoc CONDITION TARGET Qt::QmlDevToolsPrivate - LIBRARIES - Qt::QmlDevToolsPrivate PUBLIC_LIBRARIES - Qt::QmlDevTools + Qt::QmlDevToolsPrivate ) qt_extend_target(qdoc CONDITION NOT TARGET Qt::QmlDevToolsPrivate diff --git a/src/qdoc/CMakeLists.txt b/src/qdoc/CMakeLists.txt index d9d262620..cb8461ee5 100644 --- a/src/qdoc/CMakeLists.txt +++ b/src/qdoc/CMakeLists.txt @@ -15,6 +15,7 @@ qt_add_tool(qdoc cppcodemarker.cpp cppcodemarker.h cppcodeparser.cpp cppcodeparser.h doc.cpp doc.h + docbookgenerator.cpp docbookgenerator.h editdistance.cpp editdistance.h generator.cpp generator.h helpprojectwriter.cpp helpprojectwriter.h @@ -81,10 +82,8 @@ qt_add_tool(qdoc # _REQUIREMENTS = "qtConfig(xmlstreamwriter)" qt_extend_target(qdoc CONDITION TARGET Qt::QmlDevToolsPrivate - LIBRARIES - Qt::QmlDevToolsPrivate PUBLIC_LIBRARIES - Qt::QmlDevTools + Qt::QmlDevToolsPrivate ) qt_extend_target(qdoc CONDITION NOT TARGET Qt::QmlDevToolsPrivate diff --git a/src/qtdiag/CMakeLists.txt b/src/qtdiag/CMakeLists.txt index 713d32091..cfe9f786d 100644 --- a/src/qtdiag/CMakeLists.txt +++ b/src/qtdiag/CMakeLists.txt @@ -8,11 +8,10 @@ qt_add_executable(qtdiag SOURCES main.cpp qtdiag.cpp qtdiag.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) ## Scopes: diff --git a/src/windeployqt/.prev_CMakeLists.txt b/src/windeployqt/.prev_CMakeLists.txt new file mode 100644 index 000000000..b80096ebe --- /dev/null +++ b/src/windeployqt/.prev_CMakeLists.txt @@ -0,0 +1,39 @@ +# Generated from windeployqt.pro. + +##################################################################### +## windeployqt Tool: +##################################################################### + +qt_add_tool(windeployqt + BOOTSTRAP + SOURCES + ../shared/winutils/elfreader.cpp ../shared/winutils/elfreader.h + ../shared/winutils/qmlutils.cpp ../shared/winutils/qmlutils.h + ../shared/winutils/utils.cpp ../shared/winutils/utils.h + main.cpp + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + QT_NO_FOREACH + INCLUDE_DIRECTORIES + ../shared/winutils + PUBLIC_LIBRARIES + Qt::CorePrivate +) + +#### Keys ignored in scope 1:.:.:windeployqt.pro:: +# QMAKE_TARGET_DESCRIPTION = "Qt Windows Deployment Tool" +# _OPTION = "host_build" + +## Scopes: +##################################################################### + +qt_extend_target(windeployqt CONDITION WIN32 + PUBLIC_LIBRARIES + shlwapi +) + +qt_extend_target(windeployqt CONDITION QT_FEATURE_relocatable + DEFINES + QT_RELOCATABLE +) diff --git a/src/windeployqt/CMakeLists.txt b/src/windeployqt/CMakeLists.txt index ad531bd9a..f2ae3b518 100644 --- a/src/windeployqt/CMakeLists.txt +++ b/src/windeployqt/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_add_tool(windeployqt - #BOOTSTRAP # special case + #BOOTSTRAP # special case remove SOURCES ../shared/winutils/elfreader.cpp ../shared/winutils/elfreader.h ../shared/winutils/qmlutils.cpp ../shared/winutils/qmlutils.h @@ -17,7 +17,7 @@ qt_add_tool(windeployqt QT_NO_FOREACH INCLUDE_DIRECTORIES ../shared/winutils - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::Core # special case ) diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt index 5eae3760b..bdf5c6b16 100644 --- a/tests/auto/.prev_CMakeLists.txt +++ b/tests/auto/.prev_CMakeLists.txt @@ -1,14 +1,14 @@ # Generated from auto.pro. -if(QT_FEATURE_process AND NOT CMAKE_CROSS_COMPILING) +if(QT_FEATURE_process AND NOT CMAKE_CROSSCOMPILING) add_subdirectory(linguist) add_subdirectory(qtattributionsscanner) add_subdirectory(qtdiag) endif() -if(NOT CMAKE_CROSS_COMPILING) +if(NOT CMAKE_CROSSCOMPILING) add_subdirectory(qdoc) endif() -if(TARGET Qt::Help AND NOT CMAKE_CROSS_COMPILING) +if(TARGET Qt::Help AND NOT CMAKE_CROSSCOMPILING) add_subdirectory(qhelpcontentmodel) add_subdirectory(qhelpenginecore) add_subdirectory(qhelpgenerator) @@ -17,6 +17,6 @@ if(TARGET Qt::Help AND NOT CMAKE_CROSS_COMPILING) endif() add_subdirectory(cmake) add_subdirectory(installed_cmake) -if(QT_FEATURE_process AND WIN32 AND NOT CMAKE_CROSS_COMPILING AND NOT WINRT) +if(QT_FEATURE_process AND WIN32 AND NOT CMAKE_CROSSCOMPILING AND NOT WINRT) add_subdirectory(windeployqt) endif() diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 4da71b9bf..ab374e67a 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -1,14 +1,14 @@ # Generated from auto.pro. -if(QT_FEATURE_process AND NOT CMAKE_CROSS_COMPILING) +if(QT_FEATURE_process AND NOT CMAKE_CROSSCOMPILING) add_subdirectory(linguist) add_subdirectory(qtattributionsscanner) add_subdirectory(qtdiag) endif() -if(NOT CMAKE_CROSS_COMPILING) +if(NOT CMAKE_CROSSCOMPILING) add_subdirectory(qdoc) endif() -if(TARGET Qt::Help AND NOT CMAKE_CROSS_COMPILING) +if(TARGET Qt::Help AND NOT CMAKE_CROSSCOMPILING) add_subdirectory(qhelpcontentmodel) add_subdirectory(qhelpenginecore) add_subdirectory(qhelpgenerator) @@ -19,6 +19,6 @@ endif() #add_subdirectory(cmake) #add_subdirectory(installed_cmake) # special case end -if(QT_FEATURE_process AND WIN32 AND NOT CMAKE_CROSS_COMPILING AND NOT WINRT) +if(QT_FEATURE_process AND WIN32 AND NOT CMAKE_CROSSCOMPILING AND NOT WINRT) add_subdirectory(windeployqt) endif() diff --git a/tests/auto/qdoc/CMakeLists.txt b/tests/auto/qdoc/CMakeLists.txt index e9a5da6eb..750ce80d0 100644 --- a/tests/auto/qdoc/CMakeLists.txt +++ b/tests/auto/qdoc/CMakeLists.txt @@ -1,4 +1,5 @@ # Generated from qdoc.pro. +add_subdirectory(config) add_subdirectory(generatedoutput) -add_subdirectory(qdoccommandlineparser) +add_subdirectory(utilities) diff --git a/tests/auto/qdoc/config/CMakeLists.txt b/tests/auto/qdoc/config/CMakeLists.txt new file mode 100644 index 000000000..2d54cc041 --- /dev/null +++ b/tests/auto/qdoc/config/CMakeLists.txt @@ -0,0 +1,16 @@ +# Generated from config.pro. + +##################################################################### +## tst_config Test: +##################################################################### + +qt_add_test(tst_config + SOURCES + ../../../../src/qdoc/config.cpp ../../../../src/qdoc/config.h + ../../../../src/qdoc/location.cpp ../../../../src/qdoc/location.h + ../../../../src/qdoc/loggingcategory.h + ../../../../src/qdoc/qdoccommandlineparser.cpp ../../../../src/qdoc/qdoccommandlineparser.h + tst_config.cpp + INCLUDE_DIRECTORIES + ../../../../src/qdoc +) diff --git a/tests/auto/qdoc/generatedoutput/CMakeLists.txt b/tests/auto/qdoc/generatedoutput/CMakeLists.txt index 1d8da3313..d64432b5f 100644 --- a/tests/auto/qdoc/generatedoutput/CMakeLists.txt +++ b/tests/auto/qdoc/generatedoutput/CMakeLists.txt @@ -8,7 +8,3 @@ qt_add_test(tst_generatedOutput SOURCES tst_generatedoutput.cpp ) -qt_add_docs(tst_generatedOutput - test.qdocconf -) - diff --git a/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt b/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt new file mode 100644 index 000000000..6bf74a90a --- /dev/null +++ b/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from qdoccommandlineparser.pro. + +##################################################################### +## tst_qdoccommandlineparser Test: +##################################################################### + +qt_add_test(tst_qdoccommandlineparser + SOURCES + ../../../../src/qdoc/qdoccommandlineparser.cpp ../../../../src/qdoc/qdoccommandlineparser.h + tst_qdoccommandlineparser.cpp + INCLUDE_DIRECTORIES + ../../../../src/qdoc +) diff --git a/tests/auto/qdoc/utilities/CMakeLists.txt b/tests/auto/qdoc/utilities/CMakeLists.txt new file mode 100644 index 000000000..bd949b84d --- /dev/null +++ b/tests/auto/qdoc/utilities/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from utilities.pro. + +##################################################################### +## tst_utilities Test: +##################################################################### + +qt_add_test(tst_utilities + SOURCES + ../../../../src/qdoc/loggingcategory.h + ../../../../src/qdoc/utilities.cpp ../../../../src/qdoc/utilities.h + tst_utilities.cpp + INCLUDE_DIRECTORIES + ../../../../src/qdoc +) diff --git a/tests/auto/qhelpgenerator/CMakeLists.txt b/tests/auto/qhelpgenerator/CMakeLists.txt index 02c6f6666..40ed0bec3 100644 --- a/tests/auto/qhelpgenerator/CMakeLists.txt +++ b/tests/auto/qhelpgenerator/CMakeLists.txt @@ -13,10 +13,8 @@ qt_add_test(tst_qhelpgenerator DEFINES QT_USE_USING_NAMESPACE SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::HelpPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::Help + Qt::HelpPrivate Qt::Sql ) diff --git a/tests/auto/qhelpprojectdata/CMakeLists.txt b/tests/auto/qhelpprojectdata/CMakeLists.txt index 6d686128a..1d140b287 100644 --- a/tests/auto/qhelpprojectdata/CMakeLists.txt +++ b/tests/auto/qhelpprojectdata/CMakeLists.txt @@ -12,9 +12,7 @@ qt_add_test(tst_qhelpprojectdata DEFINES QT_USE_USING_NAMESPACE SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::HelpPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::Help + Qt::HelpPrivate ) -- cgit v1.2.1