summaryrefslogtreecommitdiff
path: root/src/dialogs
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-05-19 21:33:04 +0200
committerLiang Qi <liang.qi@qt.io>2016-05-19 21:33:04 +0200
commit94c78ddf7ddea751a8e816d26f341d54184056c6 (patch)
tree08027cd798e1a7327e54aa1acab4d5baaab3cc7a /src/dialogs
parentc6713e212ef0b97c45d6466b73220567e94a05f1 (diff)
parent7e33119c487b6ce7ee1b7e8fc7b9b862adba1c91 (diff)
downloadqtquickcontrols-94c78ddf7ddea751a8e816d26f341d54184056c6.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: .qmake.conf Change-Id: Ia45d6b4318ffe60c386c8548de7bb3f07c4cd6f9
Diffstat (limited to 'src/dialogs')
-rw-r--r--src/dialogs/doc/qtquickdialogs.qdocconf2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dialogs/doc/qtquickdialogs.qdocconf b/src/dialogs/doc/qtquickdialogs.qdocconf
index d4c55b84..ccb555a7 100644
--- a/src/dialogs/doc/qtquickdialogs.qdocconf
+++ b/src/dialogs/doc/qtquickdialogs.qdocconf
@@ -26,7 +26,7 @@ depends = qtqml qtquick qtgui qtwidgets qtdoc qtcore
exampledirs += ../../../examples/quickcontrols/dialogs
-examplesinstallpath = qtquickcontrols/quickcontrols/dialogs
+examplesinstallpath = quickcontrols/dialogs
headerdirs += ..