diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 14:27:27 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 14:27:27 +0100 |
commit | d9a3e03934076aea8852f1c4b142a5ecfeea0297 (patch) | |
tree | 6832178b5dddb8bf4dc61590265a638133f8bcfd /src/assistant/assistant/assistant.pro | |
parent | 4c0ba237eabf66e028459e86620c448c4e21760a (diff) | |
parent | 64221433d7a82955b111e20178c9527cb0373914 (diff) | |
download | qttools-d9a3e03934076aea8852f1c4b142a5ecfeea0297.tar.gz |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
Change-Id: Ia86822a3b64be4e17d525f6b055eadfab7215bc8
Diffstat (limited to 'src/assistant/assistant/assistant.pro')
-rw-r--r-- | src/assistant/assistant/assistant.pro | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro index b63be28c7..5da0b0077 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -23,14 +23,14 @@ HEADERS += aboutdialog.h \ cmdlineparser.h \ contentwindow.h \ findwidget.h \ - filternamedialog.h \ + helpdocsettings.h \ + helpdocsettingswidget.h \ helpenginewrapper.h \ helpbrowsersupport.h \ helpviewer.h \ helpviewer_p.h \ indexwindow.h \ mainwindow.h \ - optionswidget.h \ preferencesdialog.h \ qtdocinstaller.h \ remotecontrol.h \ @@ -56,14 +56,14 @@ SOURCES += aboutdialog.cpp \ cmdlineparser.cpp \ contentwindow.cpp \ findwidget.cpp \ - filternamedialog.cpp \ + helpdocsettings.cpp \ + helpdocsettingswidget.cpp \ helpenginewrapper.cpp \ helpbrowsersupport.cpp \ helpviewer.cpp \ indexwindow.cpp \ main.cpp \ mainwindow.cpp \ - optionswidget.cpp \ preferencesdialog.cpp \ qtdocinstaller.cpp \ remotecontrol.cpp \ @@ -97,7 +97,7 @@ win32 { FORMS += bookmarkdialog.ui \ bookmarkmanagerwidget.ui \ bookmarkwidget.ui \ - filternamedialog.ui \ + helpdocsettingswidget.ui \ preferencesdialog.ui \ topicchooser.ui |