diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-04-24 12:39:54 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-04-24 13:58:05 +0200 |
| commit | d79febdde966f8becfbf2c0a4fdd4cd4ed4f2c25 (patch) | |
| tree | 0fa42e55e8aa480982d8f1d9561cbfffd3501c7d /doc | |
| parent | 02785342acc1580210e6d69b5893c431ddc0c009 (diff) | |
| parent | 20b095c6b4b9bd394a4ad6062a588de5bbf14b52 (diff) | |
| download | qt-creator-d79febdde966f8becfbf2c0a4fdd4cd4ed4f2c25.tar.gz | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
Change-Id: I90ef0063ed24e23bcb3d73fff086f50324faa1e2
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/qtdesignstudio/config/qtdesignstudio.qdocconf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf index 0574bbed10..1fcda6e66a 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 \ @@ -23,6 +21,7 @@ imagedirs = ../images \ ../../../src/plugins/help/images \ ../../../src/plugins/projectexplorer/images \ ../../../src/plugins/qmldesigner/components/componentcore/images \ + ../../../src/plugins/qmldesigner/components/edit3d/images \ ../../../src/plugins/qmldesigner/components/formeditor \ ../../../src/plugins/qmldesigner/components/navigator \ ../../../src/plugins/qmldesigner/components/timelineeditor/images \ |