diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:32:13 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:32:47 +0100 |
| commit | 6bf6c1285442d2cb74537d4b87f4605295c841e5 (patch) | |
| tree | ea3f1a52d0b55cbeb84bc3bd6c1be8e513a528fd /src/corelib | |
| parent | 15a32435561a668e69764d12edfa2b5c564c6505 (diff) | |
| parent | 5e5bc779c3e3099159503f989de6baf589ea90d7 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Iaa321deb9e536ce89b87a337b57634f00c770a32
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/doc/qtcore.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf index 61c9d2bc00..cb87530f54 100644 --- a/src/corelib/doc/qtcore.qdocconf +++ b/src/corelib/doc/qtcore.qdocconf @@ -37,6 +37,6 @@ exampledirs += \ snippets \ ../../../examples/threads/ \ ../../../examples/tools/ \ - ../../../examples/widgets/widgets/analogclock + ../../../examples/widgets/ imagedirs += images |