1 files changed, 15 insertions, 36 deletions
diff --git a/src/assistant/assistant/CMakeLists.txt b/src/assistant/assistant/CMakeLists.txt
index d8a56090c..10df7f777 100644
--- a/src/assistant/assistant/CMakeLists.txt
+++ b/src/assistant/assistant/CMakeLists.txt
@@ -1,4 +1,5 @@
-# Generated from assistant.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## assistant App:
@@ -25,7 +26,7 @@ qt_internal_add_app(assistant
         helpdocsettings.cpp helpdocsettings.h
         helpdocsettingswidget.cpp helpdocsettingswidget.h helpdocsettingswidget.ui
         helpenginewrapper.cpp helpenginewrapper.h
-        helpviewer.cpp helpviewer.h helpviewer_p.h
+        helpviewer.cpp helpviewer.h helpviewerimpl.cpp helpviewerimpl.h helpviewerimpl_p.h
         indexwindow.cpp indexwindow.h
         main.cpp
         mainwindow.cpp mainwindow.h
@@ -42,35 +43,25 @@ qt_internal_add_app(assistant
         xbelsupport.cpp xbelsupport.h
     INCLUDE_DIRECTORIES
         ../../shared/fontpanel
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Gui
         Qt::Help
         Qt::Network
         Qt::Sql
         Qt::Widgets
-        Qt::PrintSupport # special case
+        Qt::PrintSupport
+        qlitehtml
     ENABLE_AUTOGEN_TOOLS
         uic
 )
 
 # Resources:
-set(assistant_resource_files
-    "assistant.qch"
-)
-
-qt_add_resource(assistant "assistant"
-    PREFIX
-        "/qt-project.org/assistant"
-    FILES
-        ${assistant_resource_files}
-)
 set(assistant_images_resource_files
     "images/assistant-128.png"
     "images/assistant.png"
     "images/bookmark.png"
     "images/closebutton.png"
     "images/darkclosebutton.png"
-    "images/mac/addtab.png"
     "images/mac/book.png"
     "images/mac/closetab.png"
     "images/mac/editcopy.png"
@@ -83,7 +74,6 @@ set(assistant_images_resource_files
     "images/mac/synctoc.png"
     "images/mac/zoomin.png"
     "images/mac/zoomout.png"
-    "images/win/addtab.png"
     "images/win/book.png"
     "images/win/closetab.png"
     "images/win/editcopy.png"
@@ -99,7 +89,7 @@ set(assistant_images_resource_files
     "images/wrap.png"
 )
 
-qt_add_resource(assistant "assistant_images"
+qt_internal_add_resource(assistant "assistant_images"
     PREFIX
         "/qt-project.org/assistant"
     FILES
@@ -110,35 +100,26 @@ set_target_properties(assistant PROPERTIES
     QT_TARGET_DESCRIPTION "Qt Assistant"
 )
 
-#### Keys ignored in scope 1:.:.:assistant.pro:<TRUE>:
-# PROJECTNAME = "Assistant"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:assistant.pro:TARGET Qt::WebKitWidgets AND NOT QT_CONFIG___contains___static:
-# BROWSER = "qtwebkit"
-
-#### Keys ignored in scope 3:.:.:assistant.pro:else:
-# BROWSER = "qtextbrowser"
-
-qt_extend_target(assistant CONDITION TARGET Qt::PrintSupport
+qt_internal_extend_target(assistant CONDITION TARGET Qt::PrintSupport
     PUBLIC_LIBRARIES
         Qt::PrintSupport
 )
 
-qt_extend_target(assistant CONDITION BROWSER___equals___qtwebkit
+qt_internal_extend_target(assistant CONDITION BROWSER___equals___qtwebkit
     SOURCES
-        helpviewer_qwv.cpp
+        helpviewerimpl_qwv.cpp
     DEFINES
         BROWSER_QTWEBKIT
     PUBLIC_LIBRARIES
         Qt::WebKitWidgets
 )
 
-qt_extend_target(assistant CONDITION NOT BROWSER___equals___qtwebkit
+qt_internal_extend_target(assistant CONDITION NOT BROWSER___equals___qtwebkit
     SOURCES
-        helpviewer_qtb.cpp
+        helpviewerimpl_qtb.cpp
     DEFINES
         BROWSER_QTEXTBROWSER
 )
@@ -155,7 +136,7 @@ if(WIN32)
     )
 endif()
 
-qt_extend_target(assistant CONDITION WIN32
+qt_internal_extend_target(assistant CONDITION WIN32
     SOURCES
         stdinlistener_win.cpp stdinlistener_win.h
     PUBLIC_LIBRARIES
@@ -168,7 +149,7 @@ if(UNIX)
     )
 endif()
 
-qt_extend_target(assistant CONDITION UNIX
+qt_internal_extend_target(assistant CONDITION UNIX
     SOURCES
         stdinlistener.cpp stdinlistener.h
 )
@@ -186,13 +167,11 @@ if(APPLE)
     target_sources(assistant PRIVATE
         assistant.icns
     )
-    # special case end
     # Set values to be replaced in the custom Info_mac.plist.
     set(ICON "assistant.icns")
     set(EXECUTABLE "Assistant")
-    # special case end
 endif()
-qt_add_docs(assistant
+qt_internal_add_docs(assistant
     doc/qtassistant.qdocconf
 )