diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-15 11:57:21 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-16 17:43:23 +0000 |
| commit | ffdb00d903ca343ac08ffb44535956d6fad9ae49 (patch) | |
| tree | f4fed10374a95003fea07b52edd6377e180eea30 | |
| parent | 03967915ea171e7e53201734f158654b0c315f59 (diff) | |
List .qdoc files and snippets in OTHER_FILES
Change-Id: Ic33bc3d69771dab79ccaf307b00ed0f840b9e8b2
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| -rw-r--r-- | src/imports/controls/controls.pro | 3 | ||||
| -rw-r--r-- | src/imports/controls/doc/doc.pri | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index 282c3217..15c07cf0 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -7,8 +7,6 @@ QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII -QMAKE_DOCS = $$PWD/doc/qtquickcontrols2.qdocconf - OTHER_FILES += \ qmldir @@ -20,6 +18,7 @@ RESOURCES += \ include(controls.pri) !static: include(designer/designer.pri) +include(doc/doc.pri) qtquickcompiler { qmlfiles.prefix = /qt-project.org/imports/QtQuick/Controls.2 diff --git a/src/imports/controls/doc/doc.pri b/src/imports/controls/doc/doc.pri new file mode 100644 index 00000000..8eaccbed --- /dev/null +++ b/src/imports/controls/doc/doc.pri @@ -0,0 +1,7 @@ +QMAKE_DOCS = $$PWD/qtquickcontrols2.qdocconf + +OTHER_FILES += \ + $$files($$PWD/snippets/*.qml) \ + $$files($$PWD/src/*.qdoc) \ + $$files($$PWD/src/calendar/*.qdoc) \ + $$files($$PWD/src/templates/*.qdoc) |