| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I05e7e2984c70173408491deeeb2df92a578f00f9
Reviewed-by: hjk <hjk@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: Ib061ded7b4a5e18a1e4d277a840c1916aa51c79f
|
| |\ \
| | |/
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I994bcc0a4d0587dbb1f0566a7a6b3f110f1175aa
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In BearerCloud::timerEvent(), bite the bullet and use a std::vector
instead of a QList to avoid repeated qAsConst() applications.
In BearerCloud::configurationRemoved() and configurationChanged(),
instead of iterating over QMultiMap::uniqueKeys() and QMap::remove(),
iterate directly over the QMultiMap and remove the desired elements.
Cache a QString.
In BearerCloud::updateConfigurations(), instead of using while !isEmpty()
takeFirst() on a local copy of a QList, simply iterate over the QList
(now made const) using C++11 ranged for.
In tst_QSvgGenerator, replace a QList of statically-known size with
a C array.
Change-Id: Ic0dd1c67d0819fe6167f2bce248f9b910be65803
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ic345acc4e7cf08a0fd94c9e3a1fd2279cdd8a93e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
tests/auto/qicon_svg/qicon_svg.pro
Change-Id: I062ecbb9b092286c3ca7ec5deac3a0767329ba3f
|
| |\ \
| | |/
| | |
| | | |
Change-Id: I8b1872f788a714894a73912700bcd07d72db31bc
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Coverity (CIDs 22640, 22316) complained that some members weren't
initialized. Although setters are provided for these members, we have
no guarantee that they're called, so initialize to sensible values.
Chose indefinite repeat (repeat count -1) rather than single-shot.
In the process, discovered each class's m_to was used only in the
constructor (my initial change removed even this use, leading to a
compiler warning, as error, on OSX); so removed from both classes.
Change-Id: Ibb88a6190f2d740f57c67c1d5ee8a7b03129c510
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
|\ \ \
| |/ /
| | |
| | | |
Change-Id: I02f07888db8531778c1e28aa3da6d2166c7b8c8a
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I55408b98072be007247bca4fa61f1a62ce32e7ca
|
| | |\
| | | |
| | | |
| | | | |
Change-Id: I603566cf4d54826b61dc4adcea85bbb94c0c9be6
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Examples in binary packages now directly match the install path.
Change-Id: I15cc16953efdfb3e327de82e3f6c412941811853
Task-number: QTBUG-52953
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix qdoc warnings:
../qtsvg/src/svg/doc/qtsvg.qdocconf:33: warning: Cannot find file or directory: ../../plugins/svg
../qtsvg/src/svg/doc/qtsvg.qdocconf:36: warning: Cannot find file or directory: ../../plugins/svg
Change-Id: I6a085c539bd0244184e5b9a53878fb1e0144bd4c
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Quiets a warning about an unhandled member.
Change-Id: I20f6b6849176df541fba2e1a75d1d4ee8f2df303
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I405bdd8a5515d2e475bbe5fbb601c022f40a1169
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
|
|\ \ \
| |/ /
| | |
| | | |
Change-Id: I8226348c242d0d5bf1f78adc376ecbe26215445e
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Iccc2699ace61727ae07b362442a0b87f9958e4e0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
| |\ \
| | |/
| | |
| | | |
Change-Id: I690e64f28de8d7a7768213f89858d3c19246fa08
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
... or equivalent.
QtBase 5.6 headers already compile that way, so let the other
modules follow suit.
Task-number: QTBUG-45291
Change-Id: I725682ffe00dab94f84b00eed3aa76377bb80519
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| | |
Remove #ifdef sections for Q_OS_WINCE, wince .pro file clauses
and Windows CE-specific files.
Task-number: QTBUG-51673
Change-Id: I07ea3a9522d5b6bd8cce6f5256d92e65a699e3f5
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ia508d1e3f74dd35ac28b104c0cbdacdb6fe16d6b
|
| |\
| | |
| | |
| | | |
Change-Id: I600bace05d6bc88a9f69962698512127d4a4bb4e
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is already the case for qtbase and qtwebkit, while here only
hard-coded "zdll.lib" was used on Windows.
Change-Id: I83a86e17ebd0ed6ae4ef47925b3fdaf38984617c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: If4d760f369c34301778a13a68bbd03079a479a80
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
| |\ \
| | |/
| | |
| | | |
Change-Id: I4e901d3337a82cf07a0ac9aa56ed02a400d6905d
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The node name list needs to be kept in sync with the QSvgNode::Type enum
otherwise it will match the wrong name for the wrong value after the
missing entry.
Change-Id: Ib13025bc3c5f31ff4f76638d05d1419ad091622b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The examplesinstallpath variable in .qdocconf files defines the path
under QT_INSTALL_EXAMPLES where examples are found.
To match the way examples are packaged in Qt 5.6, prefix the
install path with the repository name.
Task-number: QTBUG-48736
Change-Id: I5767e7e8a91e4da1be162693d33a8d2eafc6144f
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.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: Ic6430f00198baec15a51c37c8c8ff01bd7014b8b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ie4d5aac39958b8e1fe946d61679a98fdc21c7b0b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I5bb1c630eff9d484098fcade5da6b1ed3680bc27
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|/ /
| |
| |
| |
| | |
Change-Id: Ic899f7ac59f11d84d76101f8221051a7d94fdd9a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: I2fb05270eb946536c50938f40bc54853acc84e98
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ife2fa97ef8395753523aba96757fac8885a75980
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QTextLayout::additionalFormats setters and getters using QList<FormatRange> have
been deprecated; port to the QVector versions.
Also perform two drive-by optimizations: using resize() instead of push_back()
to append default-constructed elements (saving one or two copy ctor calls).
Change-Id: I8b6d424f9d3ba2eb0f12098f92bb7bee11ab6d76
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
|
|\ \
| |/
| |
| | |
Change-Id: I5c6805b48d62c913ed6e8e1e0efb20013b34cba6
|
| |
| |
| |
| |
| | |
Change-Id: I3f5af4d3355f790ef17715fc0617c66b78ee78d0
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
|
|\ \
| |/
| |
| | |
Change-Id: Ib10578aaf1e3be931a19e266d4a18a094b3e4728
|
| |
| |
| |
| |
| |
| |
| |
| | |
QImageWriter::supportedMimeTypes() is missing "image/svg+xml", because
it was missing in svg.json.
Change-Id: Ica006e2a9e921deed5469c58f939b585dbf8c4ea
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
|
|\ \
| |/
| |
| | |
Change-Id: Idaa606177bbdd5b078d04d5e9916d319bf00b66b
|
| |
| |
| |
| |
| |
| |
| |
| | |
The two macros were replaced with qPremultiply and qUnpremultiply in
Qt 5.3, and this is the last place in Qt the old macros are still used.
Change-Id: Ic1bd1f37a843ffa76e37adfcbbde39fbfbd9ff2a
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
|