diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-22 08:44:34 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-22 08:55:29 +0200 |
| commit | ab91c57135f7a86437a5a4341cd32df1d4682480 (patch) | |
| tree | 713612fe2c27ff43ab4a3d5ed3b363c6141d5fbf /src/imports/controls/controls.pro | |
| parent | c5a44092c8b73c540862c4a160c31487a8518992 (diff) | |
| parent | 7193318330bc518255fb7ed008c144578f49b4bd (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I37aab846346692fd4bff08b0dbab66db3a8e2716
Diffstat (limited to 'src/imports/controls/controls.pro')
| -rw-r--r-- | src/imports/controls/controls.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index 999245c8..9e8a3c27 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 |