diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-05 16:48:06 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-05 16:48:06 +0100 |
| commit | 463e46245543540652168861b3d6c65980fb7b05 (patch) | |
| tree | 5c548c6b989b9f88182b4e2611c13bc51d9c1ad0 /src/imports/controls/doc | |
| parent | 2d1c8c4d136cbe6194a5faef971359e00dae366d (diff) | |
| parent | 4f7ec6143afce84804a230306008caefaa86a05b (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
examples/quickcontrols2/quickcontrols2.pro
Change-Id: If2f5e40487ba6515ba322f92380573727bdd6bc0
Diffstat (limited to 'src/imports/controls/doc')
| -rw-r--r-- | src/imports/controls/doc/doc.pri | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/controls/doc/doc.pri b/src/imports/controls/doc/doc.pri index 8eaccbed..f39405e7 100644 --- a/src/imports/controls/doc/doc.pri +++ b/src/imports/controls/doc/doc.pri @@ -2,6 +2,7 @@ QMAKE_DOCS = $$PWD/qtquickcontrols2.qdocconf OTHER_FILES += \ $$files($$PWD/snippets/*.qml) \ + $$files($$PWD/snippets/screenshots/*.qml) \ $$files($$PWD/src/*.qdoc) \ $$files($$PWD/src/calendar/*.qdoc) \ $$files($$PWD/src/templates/*.qdoc) |