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/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/assistant')
-rw-r--r-- | src/assistant/assistant/.prev_CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/assistant/assistant/CMakeLists.txt | 8 |
2 files changed, 4 insertions, 12 deletions
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" |