| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
The QImageIOHandler::name() has been deprecated since 5.13, but its
overrides weren't. Enabled compilation of the overrides only when the
QImageIOHandler::name() is compiled.
Task-number: QTBUG-76491
Change-Id: Ida625f19d61081cfd50ae11ab50cf7829aef80a5
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix:
qsvgiconengine.cpp: In member function ‘virtual QPixmap QSvgIconEngine::pixmap(const QSize&, QIcon::Mode, QIcon::State)’:
qsvgiconengine.cpp:200:38: warning: ‘static bool QPixmapCache::find(const QString&, QPixmap&)’ is deprecated: Use bool find(const QString &, QPixmap *) instead [-Wdeprecated-declarations]
tst_qsvgrenderer.cpp:479:54: warning: ‘const QMatrix& QPainter::worldMatrix() const’ is deprecated: Use worldTransform() instead [-Wdeprecated-declarations]
...
glwidget.cpp: In member function ‘void GLWidget::draw()’:
glwidget.cpp:231:41: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]
glwidget.cpp:232:41: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]
fluidlauncher.cpp:71:65: warning: ‘const QRect QDesktopWidget::screenGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations]
Change-Id: Iae20d950c3118d05f91202c8020dbd81fa73b48f
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch makes the svg icon code similar to the code for pixmap icons.
We only style the code if we fetch a different mode (+it is not normal)
and we try to find icons in same order as the pixmap icons.
[ChangeLog][][QIcon/QSvgIconEngine] Made SVG icons behave like pixmap icons:
An explicitly-set disabled icon is no longer additionally grayed out.
Task-number: QTBUG-67452
Change-Id: I94b4146bae2e9d924a96b602bf23909bd7f0e934
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Morten Kristensen <msk@nullpointer.dk>
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
QImage allocation failure, typically because of out-of-range
dimensions, was not immediately caught and reported. This could lead
confusing error messages as QPainter would render on a null image.
Task-number: QTBUG-68229
Change-Id: If99033244728f1cea635691c6a93564976962f09
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In 4a9470e55ce08752501868c60762268fdf2c44af there was introduced
specific isNull() implementation for QSvgIconEngine. But the existing
check was not sufficient for the scenarios where the QIcon is
constructed by deserialization from QDataStream (from previously
serialized valid svg QIcon).
We also need to check the svgBuffers as the previously serialized
svgFiles are silently ignored by QSvgIconEngine::read().
Change-Id: Id64ce233baead053c8b5ca61f1d416e46a8c6088
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: David Edmundson <davidedmundson@kde.org>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I1ebd40264cf1afaf5bcbf8b2f272e153f51a5625
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the QImage given to read() already has the right size and depth, we
don't need to allocate a new image. This is consistent with other
image decoders and why a QImage is provided to the method in the first
place.
Change-Id: I4944211d4a8d4f19d000cace4a48df505d375f52
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: I855627bf0387be820d97bbc0226fed07fd1db64a
|
| |\
| | |
| | |
| | | |
Change-Id: I4b41cae71f5a5f734a7e3bb8b95130b0cb35e0ac
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use method which returns qreal. It is available since Qt 5.6.
Task-number: QTBUG-59729
Change-Id: Ifc1a101c8dd837597c35ce14f0314218d2882501
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This was via a virtual hook in QIconEngine in Qt 5.7
This is especially useful for the SVG icon loader which returns no
availableSizes which means we currently have no way to tell if an icon
was loaded or not.
Change-Id: Ic14971f94213fb2309f29bd0daa0a1c387d4da3c
Reviewed-by: Kai Uwe Broulik <kde@privat.broulik.de>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The viewBox attribute defines the svg internal coordinate system. If no
width/height is set, the viewBox size is the right choice for defaultSize.
Otherwise the standard prescribes that the specified height/width must be
used.
The old behavior ignored the width and height attributes, and this caused a
lot of problems in qml. If the viewBox was very small the result was a low
resolution image. If the viewBox was very large, loading took ages and the
result used much more memory than needed. Both situations could be avoided
by setting sourceSize. But when using the same image several times, the
sourceSize must be set every time to the same value, otherwise the image
cache would not work. It is cheaper to have the same high-quality source
image in the cache, and scale it down when required.
With the new behavior it is possible to control the default image size
directly in the svg file at one place while it is still possible to set
different sourceSizes if needed.
Task-number: QTBUG-44863
Change-Id: I9c2fc7c122a29ebcf288b7cbd12427e081d404d5
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
|\
| |
| |
| | |
Change-Id: I43247261a4dc8badc4ad4f4d2137cdbd499f29db
|
| |\
| | |
| | |
| | | |
Change-Id: Ibcca419da389fc7538ee050de7c59e8b400e1978
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ib15aa96c2ed84cf3ce9793385476f9fb3cacec8c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I3cf5d9b6d6212128adab4682de33b192672f7c1f
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The imageformats plugin was trying to pass them off to QSvgRenderer,
which can't handle them when QT_NO_COMPRESS is defined.
Change-Id: I92241370d8fd4ed2328fb13a01306fa8a7e5ef6e
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Remove QIconEnginePlugin::keys() and QImageIOPlugin::keys():
they are not overriders since Qt 5.0.
Change-Id: I9127b5b72c9c37b450c6f0d0095e47b8d5454322
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I423b8531434d221880410cb3b40f10e6061769ff
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
Fix warning:
qtsvg/src/plugins/plugins.pro:3: Cannot find feature qfeatures
Change-Id: I0484aa2b1b217f1e22dc91a5d346bfeade175ab4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: I7680d625bf0afec0bfd16a97c6656aab426f39a7
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Found by UBsan:
qsvgiconengine.cpp:64:84: runtime error: left shift of 537133056 by 4 places cannot be represented in type 'int'
Fix by casting to qint64 at the start of the shift-or chain.
The total cumulative shift is by 28 places, so 64 bits should
be enough to not overflow anymore.
Change-Id: Ia37bc98c5af67a4de10fb9807addd369110f36d2
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Introduce an enumeration to describe the file type and use
QMimeDatbase to determine the type. This will detect SVG files
also in the case resource aliases without suffixes are used.
As a drive by, do not pass compressed SVG files
to QPixmap when QT_NO_COMPRESS is defined, as this likely
results in garbage.
Task-number: QTBUG-55388
Change-Id: Ib8bafca60e9238412a5c7edf560d487e512b8fd0
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I55408b98072be007247bca4fa61f1a62ce32e7ca
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If icon is not explicitly set, QSvgIconEngine always took Normal Off
icon.
Task-number: QTBUG-53328
Change-Id: I404206b0244d0009f7be1f520c2e84c0b7cd3e71
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: I690e64f28de8d7a7768213f89858d3c19246fa08
|
| |
| |
| |
| |
| |
| |
| |
| | |
this fixes static builds by ensuring that all dependencies are exported.
Task-number: QTBUG-51071
Change-Id: I20b0d2c018e3adce10629aee3fa055df437df71c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ia508d1e3f74dd35ac28b104c0cbdacdb6fe16d6b
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
canRead() would reject a file starting with an xml comment.
canRead() by design accepts anything that looks like the start of an
xml file, and the comment token "<!--" should be an indicator as good
as any of an xml file.
Task-number: QTBUG-49496
Change-Id: Id3c17f6b02344fa6a20bc2a839e345e5cebc14c2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When building without image format plugins we shouldn't even try to
build the svg image format plugin. Otherwise it will fail to load
later. Then icon engine plugin, however, can easily be built even
without image formats. Furthermore, the network example needs bearer
management.
Change-Id: I1380e5b2de7d112283ef0fb65a01a5049412af55
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new LGPL header instead of LGPL21 one
(in those files which will be under LGPL v3)
Change-Id: I4bbd8b2a35222b925c6e5cef6337e6237d3e1716
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: I5bb1c630eff9d484098fcade5da6b1ed3680bc27
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|/
|
|
|
| |
Change-Id: Ic899f7ac59f11d84d76101f8221051a7d94fdd9a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
QImageWriter::supportedMimeTypes() is missing "image/svg+xml", because
it was missing in svg.json.
Change-Id: Ica006e2a9e921deed5469c58f939b585dbf8c4ea
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
LICENSE.GPLv2
Change-Id: Id7e321e81c3b3af0c17c9d32d25c0bb905974728
|
| |
| |
| |
| |
| | |
Change-Id: Ie5995a71780842c86ce017793f4ed744c930bbbb
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
|
|/
|
|
|
|
|
|
|
|
| |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: Ie7d37928ebd680c6f1b20045de11abcd5595c73f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL
Change-Id: I847adeea20fd98e5c9a18b8c44a15de84283f216
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
A while a go, QtSvg was changed to use the QXmlStream* classes
from QtCore. Now, only tests/auto/qsvggenerator is left with a
QtXml dependency.
This patch also reverts commit
b719b93770393bbf20251e1dffc70498061e612c
Change-Id: I67417a27aa66a2db6d1985cad73e5bab806ad7d2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
| |
Use the virtual QGuiApplicationPrivate::applyQIconStyleHelper()
introduced by commit 6c06e14a49773ce5572935864ed6b9be219c6103
in qtbase to adapt the icon according to the style.
Change-Id: I7c429f818c012c58118c64cc3b20a87fcb712877
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
svg plugins are by default not linked together with
QtGui since its usage is rare. But when the pro file
contains Qt += svg, then its the opposite; The
application is likely to need the svg plugins.
Many of the examples shipped with the SDK fails building
on iOS (e.g accelbubble) because of this.
Change-Id: I83873d5405fde2b3d38e836057d55fcc2ceb9b6c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
| |
these plugins are relatively unlikely to be needed, so exclude them.
Change-Id: I57461ccdc9a7114444a2f623328239e580e4c2e9
Reviewed-by: aavit <eirik.aavitsland@digia.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-37035
Change-Id: I014988cdb57a2001685a8d50d79ee103322ed021
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
|
|
|
|
|
|
|
| |
Found by Clang 3.4.
Change-Id: Ie4e9fc535ee44caae561aacdc245c64ea5b30b46
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
| |
the way to disable the feature is to not compile the module.
Change-Id: I96f18d037243f7d6e3b3cb2c23922cc4c05c30a8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: Idd8bca1e8e9bb183bc6725b9a9d6a220d609869d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
| |
Change-Id: Icf9d15a0f1f38ab60f0dd8fc2bc6ac936dd7dc62
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
A QGuiApplication has no style so crashes on a null pointer or asserts
in qtbase
Changed test to not depend on widgets so we get
a QGuiApplication instead of a QApplication
Change-Id: Ib4dcc8f8679d3e6b8c11f7ccd5b2539c9de0803b
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: David Faure (KDE) <faure@kde.org>
|
|
|
|
|
|
|
|
| |
Needed for automating static plugin loading.
Task-number: QTBUG-28131
Change-Id: Icfcc07e659c7d07342a7892923d485b54321eae1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
| |
DESTDIR and INSTALLS+=target are set up automatically now, but
PLUGIN_TYPE needs to be defined.
Change-Id: Ib813d8bc48dad023322c476ca6f93bae4effa62a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|