aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump version5.3Frederik Gladhorn2014-08-291-1/+1
| | | | Change-Id: I0668ef08ef66d837de74816b805b634e0c0d50e8
* Bump versionv5.3.2Oswald Buddenhagen2014-06-181-1/+1
| | | | Change-Id: Ia99459e3fda29a937feac06b63610394fda43684
* Bump MODULE_VERSION to 5.3.1v5.3.1Sergio Ahumada2014-04-221-1/+1
| | | | | Change-Id: Ic647a5bb39de64d02fb5d98cbda8c7f398ce8f1e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/stable' into devv5.3.0-rc1v5.3.0-beta1v5.3.0-alpha1v5.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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-232-2/+2
|\| | | | | | | Change-Id: I90a1f360da098f92db19685a2d6b4caddf6f35e8
| * Fix domain in pngdumper.Friedemann Kleint2013-07-192-2/+2
| | | | | | | | | | | | Task-number: QTBUG-32390 Change-Id: Ia511663070b75fae7a2bef1ef16c12ac415facc6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-111-0/+2
|\| | | | | | | Change-Id: If1557686dd6626724246f700e78f77f4ed7d6d0c
| * Mark internal properties in FastBlur documentation.Mitch Curtis2013-07-081-0/+2
| | | | | | | | | | Change-Id: Icebfba44bcf22e851b925f05546d46b26d4d5cae Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: Setting navigation variables for the navigation barJerome Pasion2013-06-261-1/+4
| | | | | | | | | | | | | | -also adding 'qtdoc' 'qtcore' in the depends variable Change-Id: I8299e242412739ffdf5fdf2d889e2058f6877684 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-041-4/+5
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf sync.profile Change-Id: Ica3851cfaa4844644fbbe83c2e3c58803f170501
| * Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-291-1/+1
| | | | | | | | | | Change-Id: I76871708e861efc18786f12ac1bcd6156003e875 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * sync.profile: Point dependencies to an empty stringv5.1.0-rc2v5.1.0-rc1v5.1.0Sergio Ahumada2013-05-261-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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-236-0/+1704
|\| | | | | | | Change-Id: I4083f690818459b5d53fa025413bfb321e12e7c6
| * Add changes-5.1.0 fileSergio Ahumada2013-05-131-0/+22
| | | | | | | | | | Change-Id: I74ec8ea6ee06476f501720a4142ced70a41d2962 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Add license files mandated by (L)GPL.v5.1.0-beta1Timo Jyrinki2013-04-104-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>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-0/+22
| |\ | | | | | | | | | Change-Id: I76fa4a12697fae965069e02e860333e403b67aed
| | * Add changes-5.0.2 filev5.0.2Sergio Ahumada2013-03-201-0/+22
| | | | | | | | | | | | | | | Change-Id: I60ccd6669797865dbf0337d23d214c26078bcefe Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | | Update module version to 5.2.0Frederik Gladhorn2013-03-281-1/+1
| | | | | | | | | | | | | | | Change-Id: I3a2882ae0b5acdec6f92d95434bd1bd3ee5cb277 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-271-0/+2
|\| | | | | | | | | | | Change-Id: Ifad82383380e8a26204ebd0d5543c9a8ab338601
| * | Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| | | | | | | | | | | | | | | Change-Id: Ia93343a4a737cbb643271108eb3b77249c948752 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Merge branch 'dev' into stableSergio Ahumada2013-03-192-0/+2
| |\ \ | |/ / |/| | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I7a2f8e638aadd9b3f8b65cb600b26136f1839842
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-181-6/+6
|\ \ \ | | | | | | | | | | | | Change-Id: I7fab4ce7041dc8b7dc93d09d2c026be23975d58d
* | | | Propegate "transparentBorder" to the correct ShaderEffectSourceGunnar Sletta2013-02-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SourceProxy in the internal GaussianGlow class propegated the sourceRect, but at that point it was already too late as the source is already wrapped in another SourceProxy (as a ShaderEffectSource) which only had the default sourceRectangle. Task-number: QTBUG-29259 Change-Id: Iaf5ee44a2ef0d962e254fd52fc021aecd757221d Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | | Merge remote-tracking branch 'origin/stable' into devGunnar Sletta2013-02-056-784/+4
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: I550ba62203b0a5c4020181330185e77781dc76af
* \ \ \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-17121-126/+175
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sync.profile Change-Id: Idd8799885298e5fcef5ecc2c40bf0688fa6aa995
* | | | | | sync.profile: Point dependencies to 'refs/heads/dev'wip/androidSergio Ahumada2012-12-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should test dev branches against dev branches only by default. At some point we should automate the merges from release->stable->dev and/or decide how to handle possible conflicts. This is good enough for the time being. Change-Id: Ie5e27d7f65f6c306acb71c89b769600a46fe1150 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | | * | Merge remote-tracking branch 'origin/release' into stableOswald Buddenhagen2013-03-181-0/+2
| | | |/| | | | | | |/ | | | | | | | | | | Change-Id: I548e33c0d8c7b1c707d5be6ee2395bb313219e6f
| | | | * define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: I5a22a7a580f6e2740eb8510c8eb684475fafb72d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | | * Merge branch 'stable' into releaseJohanna Aijala2013-02-21122-876/+125
| | | | |\ | | | | |/ | | | |/| | | | | | Change-Id: Icb76f5934f37e90c0aec1524f5fe0b23add59c15
| | | * | fix doc page urlsOswald Buddenhagen2013-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they are versioned nowadays Change-Id: I3293f6891b7da657a440b6ac595288e54ecf23e9 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | | * | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-5/+5
| | |/ / | | | | | | | | | | | | | | | | Change-Id: If7c1440def877d26e93a7f44f51a51a625701c46 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | Merge branch 'release' into stableSergio Ahumada2013-01-312-32/+3
| | |\| | | | | | | | | | | | | Change-Id: I925f12d3a45bfaef51387b194da9d48605ee346d
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 14:27:22 +0000