diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-18 17:20:59 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-18 17:22:37 +0100 |
| commit | 9e7c3f09b1cf2e4645efd7aa25f69c299f880787 (patch) | |
| tree | f3fcae17e27b83fd34b3ed73879198674a792090 | |
| parent | 61c543dd72f0a1f5ff07e156d537b7ca88364330 (diff) | |
| parent | 6bdc8e067289ec168582ed0fea06588240e22fd6 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I1dda698c407edec1309116c86584e4954da81c36
| -rw-r--r-- | src/imageformats/doc/qtimageformats.qdocconf | 2 | ||||
| -rw-r--r-- | sync.profile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imageformats/doc/qtimageformats.qdocconf b/src/imageformats/doc/qtimageformats.qdocconf index 677159f..c522d32 100644 --- a/src/imageformats/doc/qtimageformats.qdocconf +++ b/src/imageformats/doc/qtimageformats.qdocconf @@ -31,7 +31,7 @@ qhp.qtimageformats.file = qtimageformats.qhp # different documentation files in Creator/Assistant. The namespace ends with # a version being a number containing a major, minor and revision element. # E.g. version 1.0 becomes 100. -qhp.qtimageformats.namespace = org.qt-project.qtimageformats.500 +qhp.qtimageformats.namespace = org.qt-project.qtimageformats.501 # Title for the package, will be the main title for the package in # Assistant/Creator. diff --git a/sync.profile b/sync.profile index 26326b6..ccc4a15 100644 --- a/sync.profile +++ b/sync.profile @@ -5,5 +5,5 @@ # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) # %dependencies = ( - "qtbase" => "refs/heads/release", + "qtbase" => "refs/heads/stable", ); |