From 081186811d8ce51029b275eb6996e571e3b39ff0 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 23 Apr 2020 19:44:21 +0200 Subject: [PATCH] qds: remove workaround when qdocconf was somewhere else After moving the QtDesignStudio documentation to the QtCreator repository there is no need for these extra files in the dev packages. Change-Id: I4e24946bb6752403a6ecafb0c474332ad2317b1a Reviewed-by: Eike Ziller Reviewed-by: Leena Miettinen --- .../config/qtdesignstudio.qdocconf | 2 -- scripts/createDevPackage.py | 18 +----------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf index 5040c9fd06d..1fcda6e66a5 100644 --- a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf +++ b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf @@ -8,8 +8,6 @@ headerdirs = sourcedirs = ../src \ ../examples/doc \ ../../qtcreator/src -# The image folders also need to added by packaging scripts, so inform your -# local release team about any changes you make. imagedirs = ../images \ ../examples/doc/images \ ../../qtcreator/images \ diff --git a/scripts/createDevPackage.py b/scripts/createDevPackage.py index 21f71eef5b5..1c8b85d1437 100755 --- a/scripts/createDevPackage.py +++ b/scripts/createDevPackage.py @@ -67,23 +67,7 @@ source_include_patterns = [ r"^doc/.*$", # include everything under doc/ r"^.*\.pri$", # .pri files in all directories that are looked into r"^.*\.h$", # .h files in all directories that are looked into - r"^.*\.hpp$", # .hpp files in all directories that are looked into - # qtdesignstudio docs are build against dev package, so we need to include some image directories - r"^share/qtcreator/qml/qmlpuppet/mockfiles/images/.*$", - r"^share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/.*$", - r"^src/libs/qmleditorwidgets/images/.*$", - r"^src/libs/utils/images/.*$", - r"^src/plugins/debugger/images/.*$", - r"^src/plugins/diffeditor/images/.*$", - r"^src/plugins/help/images/.*$", - r"^src/plugins/projectexplorer/images/.*$", - r"^src/plugins/qmldesigner/components/componentcore/images/.*$", - r"^src/plugins/qmldesigner/components/timelineeditor/images/.*$", - r"^src/plugins/qmldesigner/qmlpreviewplugin/images/.*$", - r"^src/plugins/texteditor/images/.*$", - # also some single files - r"^src/plugins/qmldesigner/components/formeditor/.*\.png$", - r"^src/plugins/qmldesigner/components/navigator/.*\.png$" + r"^.*\.hpp$" # .hpp files in all directories that are looked into ] build_include_patterns = [