Merge remote-tracking branch 'origin/5.6' into 5.7 (410b6b52) · Commits · BC / public / external / Qt / QtSVG · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

QtSVG
- Activity
- Members
- Labels
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

BC
public
external
Qt
QtSVG
Commits
410b6b52

Commit 410b6b52 authored 8 years ago by

Liang Qi

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: Ibcca419da389fc7538ee050de7c59e8b400e1978

parents 83fe59a8 4704ecbf

Branches

Tags

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/iconengines/svgiconengine/main.cpp 4 additions, 0 deletions

src/plugins/iconengines/svgiconengine/main.cpp
src/plugins/iconengines/svgiconengine/qsvgiconengine-nocompress.json 3 additions, 0 deletions

.../iconengines/svgiconengine/qsvgiconengine-nocompress.json
src/plugins/iconengines/svgiconengine/svgiconengine.pro 1 addition, 0 deletions

src/plugins/iconengines/svgiconengine/svgiconengine.pro
src/plugins/imageformats/svg/main.cpp 8 additions, 0 deletions

src/plugins/imageformats/svg/main.cpp
src/plugins/imageformats/svg/qsvgiohandler.cpp 11 additions, 2 deletions

src/plugins/imageformats/svg/qsvgiohandler.cpp
src/plugins/imageformats/svg/svg-nocompress.json 4 additions, 0 deletions

src/plugins/imageformats/svg/svg-nocompress.json
src/plugins/imageformats/svg/svg.json 1 addition, 1 deletion

src/plugins/imageformats/svg/svg.json
sync.profile 0 additions, 10 deletions

sync.profile

with 32 additions and 13 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment