diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 14:44:16 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 14:44:37 +0200 |
commit | cac497e7a45fc901798663006ac7894b7197a549 (patch) | |
tree | f79fb413d3adfd2fa181ba672832bb342c38a607 /src/quick/doc | |
parent | e99cb6767b54aa9b082c4fd8bef93760c563da59 (diff) | |
parent | 5ce41d1e77db3f46c396834f698826f4fd998344 (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ie916db2bc4973016541176363d08c5dd14ff6b69
Diffstat (limited to 'src/quick/doc')
-rw-r--r-- | src/quick/doc/qtquick.qdocconf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index f20890c378..30861d9b2e 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -61,4 +61,5 @@ sourcedirs += ../../plugins #exclude certain directories excludedirs += ../../imports/dialogs \ - ../../imports/models + ../../imports/models \ + ../../../examples/quick/dialogs |