diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 14:35:40 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 16:25:40 +0000 |
commit | 3b673994ea0311616db7022cef859705e25cdfab (patch) | |
tree | 7e637d7c5df75f121fce53ac8aeb59178e21981c /src/assistant | |
parent | d9a3e03934076aea8852f1c4b142a5ecfeea0297 (diff) |
CMake: Regenerate projects after mergewip/cmake
Plus additional adjustments.
Change-Id: I0c2341ef6a5557e18df91b753f9e441c5b1a68e2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/assistant')
-rw-r--r-- | src/assistant/.prev_CMakeLists.txt | 9 | ||||
-rw-r--r-- | src/assistant/assistant/.prev_CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/assistant/assistant/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/assistant/help/.prev_CMakeLists.txt | 68 | ||||
-rw-r--r-- | src/assistant/help/CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/assistant/qhelpgenerator/CMakeLists.txt | 4 |
6 files changed, 94 insertions, 15 deletions
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 ) |