2 files changed, 80 insertions, 0 deletions
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"