Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtImageFormats
Commits
9e7c3f09
Commit
9e7c3f09
authored
12 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I1dda698c407edec1309116c86584e4954da81c36
parents
61c543dd
6bdc8e06
dev
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
5.3
5.4
5.5
5.6
5.7
5.8
5.9
5.9.8
6.0
6.0.0
6.1
6.1.0
6.1.1
6.1.2
6.1.3
6.2
6.2.0
6.2.1
6.2.2
old/5.0
old/5.1
old/5.2
stable
wip/cmake
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
v5.5.1
v5.5.0
v5.5.0-rc1
v5.5.0-beta1
v5.5.0-alpha1
v5.4.2
v5.4.1
v5.4.0
v5.4.0-rc1
v5.4.0-beta1
v5.4.0-alpha1
v5.3.2
v5.3.1
v5.3.0
v5.3.0-rc1
v5.3.0-beta1
v5.3.0-alpha1
v5.2.1
v5.2.0
v5.2.0-rc1
v5.2.0-beta1
v5.2.0-alpha1
v5.1.1
v5.1.0
v5.1.0-rc2
v5.1.0-rc1
v5.1.0-beta1
v5.1.0-alpha1
v5.0.2
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/imageformats/doc/qtimageformats.qdocconf
+1
-1
src/imageformats/doc/qtimageformats.qdocconf
sync.profile
+1
-1
sync.profile
with
2 additions
and
2 deletions
src/imageformats/doc/qtimageformats.qdocconf
+
1
−
1
View file @
9e7c3f09
...
@@ -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.50
0
qhp.qtimageformats.namespace = org.qt-project.qtimageformats.50
1
# 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.
...
...
This diff is collapsed.
Click to expand it.
sync.profile
+
1
−
1
View file @
9e7c3f09
...
@@ -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/
releas
e"
,
"qtbase"
=>
"refs/heads/
stabl
e"
,
);
);
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets