diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 19:30:17 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 19:30:17 +0200 |
| commit | 4f5cbf66effb9e044da7be9904a6db493d8b2611 (patch) | |
| tree | fb886e83bf20336eae85142f65bed64f10e97995 /doc/qtwebkitexamples.qdocconf | |
| parent | 16fc04fe54c2838cd697845d2fe540b7be500b5e (diff) | |
| parent | a4db690e3d09d2341b101557fa2875423db192d2 (diff) | |
| download | qtwebkit-examples-4f5cbf66effb9e044da7be9904a6db493d8b2611.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: Iab6cfb72de2d9ad06d35d5b98e1cf8b369a29e00
Diffstat (limited to 'doc/qtwebkitexamples.qdocconf')
| -rw-r--r-- | doc/qtwebkitexamples.qdocconf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/qtwebkitexamples.qdocconf b/doc/qtwebkitexamples.qdocconf index e0228ba..d87e530 100644 --- a/doc/qtwebkitexamples.qdocconf +++ b/doc/qtwebkitexamples.qdocconf @@ -1,8 +1,8 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtWebKitExamples -description = "Qt WebKit Examples and Demos Documentation" -url = http://qt-project.org/doc/qt-$QT_VER/qtwebkitexamples +description = "Qt WebKit Examples Documentation" +url = http://qt-project.org/doc/qt-$QT_VER/qtwebkitexamples version = $QT_VERSION # Defines the name of the project. You cannot use operators (+, =, -) in |