diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 22:58:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 22:58:29 +0200 |
| commit | 15a4b04db0c46cfc3f1f4475adaf057736458ec5 (patch) | |
| tree | 4454322d42d728e9f4bf9a0f4c8cb69baa5ea880 /src/imports/controls/doc | |
| parent | 4ecf0a7da5acad1cd49b53e15c5716770b5e3c2b (diff) | |
| parent | d99e10e156f8d87e72cc76a9cb6dfff990eeed4c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
src/imports/controls/doc/qtlabscontrols.qdocconf
src/imports/controls/doc/qtquickcontrols2.qdocconf
src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp
src/imports/controls/qtlabscontrolsplugin.cpp
src/imports/controls/qtquickcontrols2plugin.cpp
src/imports/templates/qtlabstemplatesplugin.cpp
src/imports/templates/qtquicktemplates2plugin.cpp
Change-Id: I6159e681b77e4a0a293b6bd7fb11a46d58873da0
Diffstat (limited to 'src/imports/controls/doc')
| -rw-r--r-- | src/imports/controls/doc/qtquickcontrols2.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf index 8f059281..25eb8e9c 100644 --- a/src/imports/controls/doc/qtquickcontrols2.qdocconf +++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf @@ -41,7 +41,7 @@ exampledirs += ../../../../examples/quickcontrols2 \ ../../../../tests/auto/controls/data \ snippets -examplesinstallpath = qtquickcontrols2/quickcontrols2 +examplesinstallpath = quickcontrols2 headerdirs += ../../../quicktemplates2 \ ../../calendar \ |