summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-076-20/+21
| |\ \ | | |/ | | | | | | Change-Id: I690e64f28de8d7a7768213f89858d3c19246fa08
| | * Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-023-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... 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>
| | * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-253-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | 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 Windows CE.Friedemann Kleint2016-03-1012-244/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / | | | | | | Change-Id: I009b9870e684c11e5236a8ab63f4cd184b493668
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-156-8/+22
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia508d1e3f74dd35ac28b104c0cbdacdb6fe16d6b
| * Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | | | | | Change-Id: I9c04cb78c2f7ad2a0a3a729c8b9d27e0ba48b39d
| * Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-rc1v5.6.05.6.0Liang Qi2016-01-191-1/+4
| |\ | | | | | | | | | Change-Id: I600bace05d6bc88a9f69962698512127d4a4bb4e
| | * Support custom ZLIB library name(s)5.5Mike Gelfand2016-01-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Improve format detection in the image reader pluginv5.6.0-beta1Eirik Aavitsland2015-11-203-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | make use of the new QtZlib moduleOswald Buddenhagen2015-11-181-4/+1
| | | | | | | | | | | | | | | Change-Id: If4d760f369c34301778a13a68bbd03079a479a80 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-281-0/+1
| |\ \ | | |/ | | | | | | Change-Id: I4e901d3337a82cf07a0ac9aa56ed02a400d6905d
| | * Add missing string for tspanAndy Shaw2015-10-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Fix building with unusual optionsUlf Hermann2016-02-084-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Updated license headersJani Heikkinen2016-01-257-102/+776
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are licensed under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: Ia9ba3f9e0c35ea5ae4b1b310f310f44aaf95a7f6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Updated license headersJani Heikkinen2016-01-2518-294/+600
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> examples are licensed under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header instead of LGPL21 one (in those files which will be under BSD) Change-Id: I24ade8428a20f6c0070729b5fa8b20839f07a143 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Updated license headersJani Heikkinen2016-01-2535-448/+1818
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | QSvgGenerator: POD function param should be passed by valueAnton Kudryavtsev2016-01-181-1/+1
| | | | | | | | | | | | | | | Change-Id: Ic6430f00198baec15a51c37c8c8ff01bd7014b8b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | Replace foreach with range-based forAnton Kudryavtsev2016-01-182-4/+4
| | | | | | | | | | | | | | | | | | Change-Id: Ie4d5aac39958b8e1fe946d61679a98fdc21c7b0b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* | | QSvgIconEngine: fix expensive iteration over QHash::keys()Anton Kudryavtsev2016-01-131-5/+5
| | | | | | | | | | | | | | | Change-Id: I5bb1c630eff9d484098fcade5da6b1ed3680bc27 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | QSvgIconEngine: fix build with QT_NO_COMPRESSAnton Kudryavtsev2015-12-071-1/+2
| | | | | | | | | | | | | | | Change-Id: Ic899f7ac59f11d84d76101f8221051a7d94fdd9a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-145-183/+688
|\ \ \ | |/ / | | | | | | Change-Id: Ia65d317d50da6e8ac06eade2c363f95e325c20f2
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-020-0/+0
| |\ \ | | |/ | | | | | | Change-Id: I101ec4741b844352509ee3003b173b92fefb05ba
| | * Doc: removed System Tray exampleNico Vertriest2015-09-153-183/+0
| | | | | | | | | | | | | | | | | | | | | | | | System Tray example now resides in qtbase Task-number: QTBUG-47201 Change-Id: I6f799b89c992ce53f742e0ac36abff91f2ce3a83 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * | Remove systray.qdoc and images.Friedemann Kleint2015-09-103-183/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The system tray example initially was in QtSvg after the Qt 5 modularization split since it depended on it. In the meantime, it has been moved back to qtbase. Change-Id: I6337ba71d5f53680ead7db4a52049407c88275cf Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1Liang Qi2015-08-212-0/+688
| |\ \ | | |/ | | | | | | Change-Id: I42feb5c90d477b79bf98c534dd151984a12be8bb
| | * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.15.5.1Liang Qi2015-08-190-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3c55edb069f94a9a48cf036c226d9b7263980d1c
| | | * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: Id461792979bca34385b8ca33a0d74d69d0faf5f2
| | * | Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
| | | | | | | | | | | | | | | | | | | | | | | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | | Bump versionOswald Buddenhagen2015-09-101-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ib572054ed49a2d94b4094e807c62ac1cf9be6ab9
* | | | Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.Friedemann Kleint2015-08-314-4/+0
|/ / / | | | | | | | | | | | | Change-Id: I680bec9dc24f151c1882e4f230aa5e93bca6615c Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-090-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iedb8d143caac26003fd3f9a74d1f27d87414591d
| * | Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | | | | | Change-Id: I671e3f17e11af7f2c25ca4646b28fda65a22cd64
* | | Fix Qt svg build for WEC2013Bjoern Breitmeyer2015-08-041-0/+4
| | | | | | | | | | | | | | | Change-Id: I2fb05270eb946536c50938f40bc54853acc84e98 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | Add a couple of QList::reserve() calls.Sergio Martins2015-06-081-0/+2
| | | | | | | | | | | | | | | Change-Id: Ife2fa97ef8395753523aba96757fac8885a75980 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Fix users of QTextLayout::additionalFormats to use the new APIMarc Mutz2015-06-011-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-05-113-13/+10
|\ \ \ | |/ / | | | | | | Change-Id: I5c6805b48d62c913ed6e8e1e0efb20013b34cba6
| * | Fix inconsistent overrides. [-Winconsistent-missing-override]v5.5.0-rc1v5.5.0-beta1v5.5.05.5.0Sergio Martins2015-03-221-9/+9
| | | | | | | | | | | | | | | Change-Id: I3f5af4d3355f790ef17715fc0617c66b78ee78d0 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * | Remove the old headersclean unit testThiago Macieira2015-03-182-4/+1
| | | | | | | | | | | | | | | | | | | | | We have configure -headersclean now Change-Id: I8811ae603503c20093f308d71e7a42e38ffac2db Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-03-171-1/+2
|\ \ \ | |/ / | | | | | | Change-Id: Ib10578aaf1e3be931a19e266d4a18a094b3e4728
| * | Imageformat plugin: Set mime type "image/svg+xml"Alessandro Portale2015-03-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | QImageWriter::supportedMimeTypes() is missing "image/svg+xml", because it was missing in svg.json. Change-Id: Ica006e2a9e921deed5469c58f939b585dbf8c4ea Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-03-0311-34528/+90895
|\ \ \ | |/ / | | | | | | Change-Id: Idaa606177bbdd5b078d04d5e9916d319bf00b66b
| * | Stop using PREMUL and INV_PREMUL macrosv5.5.0-alpha1Allan Sandfeld Jensen2015-02-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Merge dev into 5.5Oswald Buddenhagen2015-02-241-1/+1
| |\ \ | | | | | | | | | | | | Change-Id: I5c60ab8323095915cf62e7309c98acd3fd3f8fcc
| * \ \ Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-2010-34525/+90892
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: LICENSE.GPLv2 Change-Id: Id7e321e81c3b3af0c17c9d32d25c0bb905974728
| | * | remove unnecessary LICENSE.GPLv2v5.4.25.4.2Jani Heikkinen2015-02-191-292/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I356b37997e8d53689daa8fb5df7b93dd9c6385ea Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
| | * | Fix test data for tst_GuiAppLauncherSergio Ahumada2015-02-181-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe7522bc5448c82eb917f660d6e52dd1c82844c4 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| | * | Account for the devicePixelRatio when painting the iconAndy Shaw2015-02-181-1/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie5995a71780842c86ce017793f4ed744c930bbbb Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
| | * | bic: Add/Replace 5.{0.1,2,3,4}.0 bic data for linux-gcc-amd64Sergio Ahumada2015-02-137-34230/+90878
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the ia32 data since there are no linux x86 machines in the CI system (which makes the data useless from an automated testing point of view) and most people use x64 these days anyway. Change-Id: I8ecca25b2198285090cf2128d51554dbba15e97d Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
View Lorry Controller Status