diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-06-03 10:46:09 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-03 10:46:09 +0200 |
| commit | e23ebfbd205497b449f48f0493f5d89ad535b8e3 (patch) | |
| tree | 0e3805d86943dd14b34d242b9778c9cfcc294299 /scripts | |
| parent | 23c222f61b260b56c10775197d6100f130d558b4 (diff) | |
| parent | df22fb083b659cd4f3863cc5484c74a11d6de226 (diff) | |
Merge remote-tracking branch 'origin/4.9' into 4.10
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: Id73301c82c4ba50e0a886e850da2c92bbeed4dc3
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/createDevPackage.py | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/scripts/createDevPackage.py b/scripts/createDevPackage.py index 1c8b85d143..7b9b0fc655 100755 --- a/scripts/createDevPackage.py +++ b/scripts/createDevPackage.py @@ -67,7 +67,21 @@ 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 + 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/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/qmldesignerextension/timelineeditor/images/.*$", + r"^src/plugins/texteditor/images/.*$" + # also some single files + r"^src/plugins/qmldesigner/components/formeditor/.*\.png$", + r"^src/plugins/qmldesigner/components/navigator/.*\.png$", ] build_include_patterns = [ |