summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-09-30Document DropShadow and Glow's transparentBorder properties.v5.3.99+beta1Mitch Curtis6-0/+207
Change-Id: I1f4be68c5b364e5d2151ed26b079a0f00ac31f0c Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
2014-09-21Adding designersupported to pluginsThomas Hartmann1-0/+1
This patch adds designersupported to the plugins supported by QtQuick Designer. Change-Id: I022bdeab6ef1e22dfffd7e1e95b292212aaf10eb Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-19Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn0-0/+0
Change-Id: I7289625e062c5ce4126c240b459057258793dd85
2014-09-16Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn0-0/+0
Conflicts: .qmake.conf Change-Id: I7fd0ea8631fc0f5e9228781afe66b3dda9d73f59
2014-08-29Bump versionFrederik Gladhorn1-1/+1
Change-Id: I0668ef08ef66d837de74816b805b634e0c0d50e8
2014-08-28Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn15-893/+596
Change-Id: I9e864085ed329349aaa49551a15a8521d140aaa7
2014-08-24Update license headers and add new licensesJani Heikkinen15-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>
2014-08-09Bump versionOswald Buddenhagen1-1/+1
Change-Id: I6cef2ec2af797fb7ae1b98241424b2694878bec5
2014-07-07Doc: Removing url variable from qdocconf file.Jerome Pasion1-1/+0
-url inherited from the url variable set in qtbase/doc/global Change-Id: I8491c5c29e7278eb50d27062e3cdcaf0bfccaac0 Reviewed-by: Martin Smith <martin.smith@digia.com>
2014-06-26Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn0-0/+0
Conflicts: .qmake.conf Change-Id: I29cb249c95dfed1e8d3f356d52bfe7c73c13c786
2014-06-18Bump versionOswald Buddenhagen1-1/+1
Change-Id: Ia99459e3fda29a937feac06b63610394fda43684
2014-06-11Doc: Fix qmlclass selector used in documentation configTopi Reinio1-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>
2014-05-09Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn0-0/+0
Conflicts: .qmake.conf Change-Id: I5a75f8070bf8e0c4fb52ee8eabecba2fa75b5f1f
2014-04-22Bump MODULE_VERSION to 5.3.1upstream/5.3.1upstream/5.3.0upstream/5.2.96+rc2upstream/5.2.95+rc1Sergio Ahumada1-1/+1
Change-Id: Ic647a5bb39de64d02fb5d98cbda8c7f398ce8f1e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-02-20Bump module version to 5.4.0Thiago Macieira1-1/+1
Change-Id: Ibe73377ed23dab372340712ca64b40b176dcc249 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-10Merge remote-tracking branch 'origin/stable' into devupstream/5.2.90+alphaSergio Ahumada1-1/+1
Change-Id: I82b917891d9d835ccf62b0765a43936cfc50611b
2014-02-06tst_qtgraphicaleffects: make the test work on devicesupstream/5.2.2Sergio Ahumada1-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>
2014-01-17Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn1-1/+1
Conflicts: .qmake.conf Change-Id: I81e166011a25fca9f883937fa9ebf7fbee09e9b9
2014-01-16Bump MODULE_VERSION to 5.2.2Sergio Ahumada1-1/+1
Change-Id: Idabb42fbb74c0398aa821c0592fbaa5afa92afd6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-01-15qdocconf: Remove nonexistent dependencySze Howe Koh1-1/+1
Change-Id: I7db363247c460d5a250fc59a1347d8c56b19c4b4 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-11-29Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn0-0/+0
Conflicts: .qmake.conf Change-Id: I194516b948b437c85f0c6f93a1b0b339a4a76bb9
2013-11-25Bump MODULE_VERSION to 5.2.1upstream/5.2.1Sergio Ahumada1-1/+1
Change-Id: I59276a6546747fb7e5e73fba25f199936884a828 Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-11-20Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn1-5/+4
Change-Id: Id90bd6d65f15785215cdac2c19bae937925afbd3
2013-11-14Avoid out-of-bounds accessGunnar Sletta1-5/+4
Task-number: QTBUG-33364 Change-Id: I33d713df5d60a349c48f109a5f76db5fa57573af Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
2013-11-08Merge remote-tracking branch 'origin/stable' into devSergio Ahumada25-1/+81
Change-Id: Iba1fab2097ca750924b169017e2c7d2825b066c6
2013-11-07Document recursion limitations of the graphical effects.Gunnar Sletta24-0/+80
Task-number: QTBUG-31902 Change-Id: Id9d81ffddda3ee666840f602bb8c85ff00545547 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-11-06Doc: Updated url variable in qdocconf files.Jerome Pasion1-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>
2013-09-25Bump qtgraphicaleffects version to 5.3.0Sergio Ahumada1-1/+1
Change-Id: Ib446e07e6f78af935a923cbd06383ceafe4335ef Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-13Remove unnecessary dependency to qtjsbackend from sync.profileSimon Hausmann1-1/+0
Change-Id: I3739b28c055ff43099c5a3cb0a1061fd90aa66de Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-05Merge branch 'stable' into devSergio Ahumada2-3/+30
Conflicts: .qmake.conf Change-Id: I41d9d4027204c02ea486c7665294c2024d3a3aeb
2013-07-26Merge remote-tracking branch 'origin/release' into stableSergio Ahumada1-0/+25
Change-Id: I663dcb98573fa55d69b73f3740aa54772c55ff14
2013-07-26Fix compilation of pngdumper.Friedemann Kleint1-3/+5
Change-Id: I15c281d6ddfe9dafa6b4411a47b341be35dbf98d Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-07-24Bump MODULE_VERSION to 5.1.2Sergio Ahumada1-1/+1
Change-Id: Ifac7344b43c99a2f31f4a217ef537931092f7dd8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-07-23Add changes-5.1.1 fileSergio Ahumada1-0/+25
Change-Id: I619cadbd90dcc71b7f3b1f56acb86629fd7bd1b2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-23Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2-2/+2
Change-Id: I90a1f360da098f92db19685a2d6b4caddf6f35e8
2013-07-19Fix domain in pngdumper.Friedemann Kleint2-2/+2
Task-number: QTBUG-32390 Change-Id: Ia511663070b75fae7a2bef1ef16c12ac415facc6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-11Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn1-0/+2
Change-Id: If1557686dd6626724246f700e78f77f4ed7d6d0c
2013-07-08Mark internal properties in FastBlur documentation.Mitch Curtis1-0/+2
Change-Id: Icebfba44bcf22e851b925f05546d46b26d4d5cae Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-06-26Doc: Setting navigation variables for the navigation barJerome Pasion1-1/+4
-also adding 'qtdoc' 'qtcore' in the depends variable Change-Id: I8299e242412739ffdf5fdf2d889e2058f6877684 Reviewed-by: Martin Smith <martin.smith@digia.com>
2013-06-04Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn1-4/+5
Conflicts: .qmake.conf sync.profile Change-Id: Ica3851cfaa4844644fbbe83c2e3c58803f170501
2013-05-29Bump MODULE_VERSION to 5.1.1Sergio Ahumada1-1/+1
Change-Id: I76871708e861efc18786f12ac1bcd6156003e875 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-26sync.profile: Point dependencies to an empty stringSergio Ahumada1-4/+5
This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: I9b031859972b0996987eb4cc697b06b0fb569d89 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-05-23Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn6-0/+1704
Change-Id: I4083f690818459b5d53fa025413bfb321e12e7c6
2013-05-13Add changes-5.1.0 fileSergio Ahumada1-0/+22
Change-Id: I74ec8ea6ee06476f501720a4142ced70a41d2962 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-04-10Add license files mandated by (L)GPL.Timo Jyrinki4-0/+1660
Currently only qtbase includes the required LICENSE files, which are referred to from the code headers. The same files should be distributed as part of all the modules as well, so that the (L)GPL licenses are adhered. These files were wget:d from: https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL As an addition to above, added also LICENSE.FDL. All the modules additionally require it, since they include at least *.qdoc files and in some cases a couple of others. File received via wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL Change-Id: Ib44292c867e2e54d85d69870f613f0390f5dca78 Reviewed-by: Jason McDonald <macadder1@gmail.com>
2013-04-03Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn1-0/+22
Change-Id: I76fa4a12697fae965069e02e860333e403b67aed
2013-03-28Update module version to 5.2.0Frederik Gladhorn1-1/+1
Change-Id: I3a2882ae0b5acdec6f92d95434bd1bd3ee5cb277 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-03-27Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn1-0/+2
Change-Id: Ifad82383380e8a26204ebd0d5543c9a8ab338601
2013-03-25Bump MODULE_VERSION to 5.1.0Sergio Ahumada1-1/+1
Change-Id: Ia93343a4a737cbb643271108eb3b77249c948752 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-03-20Add changes-5.0.2 fileSergio Ahumada1-0/+22
Change-Id: I60ccd6669797865dbf0337d23d214c26078bcefe Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 22:14:39 +0000