Commit 9e7c3f09 authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

Merge remote-tracking branch 'origin/release' into stable

Change-Id: I1dda698c407edec1309116c86584e4954da81c36
parents 61c543dd 6bdc8e06
Branches
Tags
No related merge requests found
Showing with 2 additions and 2 deletions
...@@ -31,7 +31,7 @@ qhp.qtimageformats.file = qtimageformats.qhp ...@@ -31,7 +31,7 @@ qhp.qtimageformats.file = qtimageformats.qhp
# different documentation files in Creator/Assistant. The namespace ends with # different documentation files in Creator/Assistant. The namespace ends with
# a version being a number containing a major, minor and revision element. # a version being a number containing a major, minor and revision element.
# E.g. version 1.0 becomes 100. # 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 # Title for the package, will be the main title for the package in
# Assistant/Creator. # Assistant/Creator.
......
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
# #
%dependencies = ( %dependencies = (
"qtbase" => "refs/heads/release", "qtbase" => "refs/heads/stable",
); );
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment