summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.15.5.15.5Liang Qi2015-08-190-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1d337a7aa19c3134ad784c726fc1055c06b3a3d2
| * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | | | | | | Change-Id: I84d9e57d5f993d8641613c9ccc4c24860f07ff8f
* | 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>
* | Doc: rearrang tables with overflowNico Vertriest2015-07-153-67/+124
| | | | | | | | | | | | Task-number: QTBUG-46475 Change-Id: I6f3256255089e40180af72d73b4c1d86ca505292 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | Change-Id: I87ae8ef991682e812f9e3c09d5d28170a8d9e505
* | Update copyright headersv5.5.0-rc1v5.5.0-beta1v5.5.0-alpha1v5.5.05.5.0Antti Kokko2015-02-17124-524/+524
| | | | | | | | | | | | | | | | | | 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: I8983b05749d75b438a314e7f385a85c612a04f6f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-191-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4f99c72926a0d0ac0b79f89a0f8f4234685b0ac3
| * Bump versionv5.4.25.4.2Oswald Buddenhagen2015-01-161-1/+1
| | | | | | | | Change-Id: I6e556cc4c1ac27c93711124fad3b77e177916ea4
| * Fix typo in Desaturate documentation.v5.4.15.4.1Mitch Curtis2015-01-051-1/+1
| | | | | | | | | | Change-Id: I048d6dbf54eff658b74f221af5faa1a517deb310 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-1725-25/+25
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie64aa3089d47063e82f8d1cb77929deee86c62ea
| * Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | | | | | Change-Id: I1c61bf871b41c725416b4f17ee258177d95fdd8d
| * Remove unnecessary \inqmlmodule parameterAlejandro Exojo2014-12-0825-25/+25
| | | | | | | | | | Change-Id: Ib685e533a97bae865df5802c4f9e7399c8cfd078 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-202-3/+3
|\ \ | |/ | | | | Change-Id: I56d3c01f3ceffc318085a3cef8bd6cfe152f141e
| * Doc: Applied title case in section1 titlesv5.4.0-rc1v5.4.0-beta1v5.4.05.4.0Nico Vertriest2014-10-101-1/+1
| | | | | | | | | | | | Task-number: QTBUG-41250 Change-Id: Ic91b1db2bd27800a808cd4c997c1b606ea4bec10 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Correct grammar in DropShadow's detailed description.Mitch Curtis2014-10-101-2/+2
| | | | | | | | | | Change-Id: If77e25a80ed139c0903b511062ff6dd615df2c70 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-097-0/+208
|\ \ | |/ | | | | Change-Id: I259099e0d550e5a1f0d6846d6024876d06fa1b4c
| * Document DropShadow and Glow's transparentBorder properties.Mitch Curtis2014-09-306-0/+207
| | | | | | | | | | | | Change-Id: I1f4be68c5b364e5d2151ed26b079a0f00ac31f0c Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * Adding designersupported to pluginsThomas Hartmann2014-09-211-0/+1
| | | | | | | | | | | | | | This patch adds designersupported to the plugins supported by QtQuick Designer. Change-Id: I022bdeab6ef1e22dfffd7e1e95b292212aaf10eb Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-09-190-0/+0
|\ \ | |/ | | | | Change-Id: I7289625e062c5ce4126c240b459057258793dd85
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-160-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7fd0ea8631fc0f5e9228781afe66b3dda9d73f59
| | * Bump version5.3Frederik Gladhorn2014-08-291-1/+1
| | | | | | | | | | | | Change-Id: I0668ef08ef66d837de74816b805b634e0c0d50e8
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-08-2815-893/+596
|\ \ \ | |/ / | | | | | | Change-Id: I9e864085ed329349aaa49551a15a8521d140aaa7
| * | Update license headers and add new licensesv5.4.0-alpha1Jani Heikkinen2014-08-2415-893/+596
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I452f44a464e8da80ee4c0c38de6ec6abfd6ac285 Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* | | Bump versionOswald Buddenhagen2014-08-091-1/+1
|/ / | | | | | | Change-Id: I6cef2ec2af797fb7ae1b98241424b2694878bec5
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
| | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I8491c5c29e7278eb50d27062e3cdcaf0bfccaac0 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-260-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I29cb249c95dfed1e8d3f356d52bfe7c73c13c786
| * Bump versionv5.3.25.3.2Oswald Buddenhagen2014-06-181-1/+1
| | | | | | | | Change-Id: Ia99459e3fda29a937feac06b63610394fda43684
* | Doc: Fix qmlclass selector used in documentation configTopi Reinio2014-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | A recent change (46959875) in qdoc raised QML types from subnodes to top-level nodes. This change modifies the documentation configuration file(s) accordingly. Change-Id: I0444e3860b15458b782982b5382469056022637c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-090-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5a75f8070bf8e0c4fb52ee8eabecba2fa75b5f1f
| * Bump MODULE_VERSION to 5.3.1v5.3.1stable5.3.1Sergio Ahumada2014-04-221-1/+1
| | | | | | | | | | Change-Id: Ic647a5bb39de64d02fb5d98cbda8c7f398ce8f1e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
|/ | | | | | Change-Id: Ibe73377ed23dab372340712ca64b40b176dcc249 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'origin/stable' into devv5.3.0-rc1v5.3.0-beta1v5.3.0-alpha1v5.3.0releasebaserock/v5.3.05.3.0Sergio Ahumada2014-02-101-1/+1
|\ | | | | | | Change-Id: I82b917891d9d835ccf62b0765a43936cfc50611b
| * tst_qtgraphicaleffects: make the test work on devicesold/5.2Sergio Ahumada2014-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Make the test find the 'QtGraphicalEffects' import under Qml2ImportsPath (QML 2.x) instead of ImportsPath (QML 1.x) when the source code is not available. This seems to have worked so far because the source code is always available in the CI machines, but it fails on devices where is not. Change-Id: I475ccd5431d5e7c3adf239b1158d7bb67e0bc042 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-171-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I81e166011a25fca9f883937fa9ebf7fbee09e9b9
| * Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
| | | | | | | | | | Change-Id: Idabb42fbb74c0398aa821c0592fbaa5afa92afd6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * qdocconf: Remove nonexistent dependencySze Howe Koh2014-01-151-1/+1
| | | | | | | | | | | | Change-Id: I7db363247c460d5a250fc59a1347d8c56b19c4b4 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-290-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I194516b948b437c85f0c6f93a1b0b339a4a76bb9
| * Bump MODULE_VERSION to 5.2.1v5.2.1Sergio Ahumada2013-11-251-1/+1
| | | | | | | | | | | | Change-Id: I59276a6546747fb7e5e73fba25f199936884a828 Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-201-5/+4
|\ \ | |/ | | | | Change-Id: Id90bd6d65f15785215cdac2c19bae937925afbd3
| * Avoid out-of-bounds accessGunnar Sletta2013-11-141-5/+4
| | | | | | | | | | | | Task-number: QTBUG-33364 Change-Id: I33d713df5d60a349c48f109a5f76db5fa57573af Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-0825-1/+81
|\ \ | |/ | | | | Change-Id: Iba1fab2097ca750924b169017e2c7d2825b066c6
| * Document recursion limitations of the graphical effects.v5.2.0-rc1v5.2.0Gunnar Sletta2013-11-0724-0/+80
| | | | | | | | | | | | | | Task-number: QTBUG-31902 Change-Id: Id9d81ffddda3ee666840f602bb8c85ff00545547 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I10272de25b7cc686b0f08a3d0460b5b91e7aa43f Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Bump qtgraphicaleffects version to 5.3.0Sergio Ahumada2013-09-251-1/+1
|/ | | | | Change-Id: Ib446e07e6f78af935a923cbd06383ceafe4335ef Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Remove unnecessary dependency to qtjsbackend from sync.profilev5.2.0-beta1v5.2.0-alpha1Simon Hausmann2013-08-131-1/+0
| | | | | Change-Id: I3739b28c055ff43099c5a3cb0a1061fd90aa66de Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-08-052-3/+30
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I41d9d4027204c02ea486c7665294c2024d3a3aeb
| * Merge remote-tracking branch 'origin/release' into stableold/5.1Sergio Ahumada2013-07-261-0/+25
| |\ | | | | | | | | | Change-Id: I663dcb98573fa55d69b73f3740aa54772c55ff14
| | * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-231-0/+25
| | | | | | | | | | | | | | | Change-Id: I619cadbd90dcc71b7f3b1f56acb86629fd7bd1b2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | Fix compilation of pngdumper.Friedemann Kleint2013-07-261-3/+5
| | | | | | | | | | | | | | | | | | Change-Id: I15c281d6ddfe9dafa6b4411a47b341be35dbf98d Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
| |/ | | | | | | | | Change-Id: Ifac7344b43c99a2f31f4a217ef537931092f7dd8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
View Lorry Controller Status