diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-27 22:51:09 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-27 22:51:09 +0200 |
| commit | 190fa97c83472863fd886e86f626ab8196ed51b3 (patch) | |
| tree | 49edb9f6a41d6c999c9bb43ae28911a8e7212757 /src/corelib/doc/qtcore.qdocconf | |
| parent | 3aa163491c9c8f28c88ac87cafc6418f2c0e46c5 (diff) | |
| parent | 5971e0918757737425151c39a5f81a238663a17a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
examples/widgets/doc/src/addressbook-fr.qdoc
Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48
Diffstat (limited to 'src/corelib/doc/qtcore.qdocconf')
| -rw-r--r-- | src/corelib/doc/qtcore.qdocconf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf index 7a3e20aa89..fdd46995c5 100644 --- a/src/corelib/doc/qtcore.qdocconf +++ b/src/corelib/doc/qtcore.qdocconf @@ -36,7 +36,8 @@ exampledirs += \ ../ \ snippets \ ../../../examples/threads/ \ - ../../../examples/tools/ + ../../../examples/tools/ \ + ../../../examples/json/ imagedirs += images |