summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-231-0/+25
| | | | | | | | | | | | | | | Change-Id: I397cf428dcf41092673b6b45e1bf5bfb39db6cbf Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-231-1/+1
| |/ | | | | | | | | Change-Id: Iad84e8a461e382e30db59fd33d8ef3240225392c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Doc: Setting \qtvariable in module page.Jerome Pasion2013-08-021-1/+1
| | | | | | | | | | | | | | \qtvariable indicates the QT variable needed in .pro files. Change-Id: Ie5323482ffc492caa30a443cc085cbecdc0e8c4a Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-113-1/+17355
|\ \ | |/ | | | | Change-Id: I1103984f1b0144df17ef4c5d7a1f3b3dd7a6e762
| * Add a unit test for testing Qt in its install location.Stephen Kelly2013-07-102-1/+8
| | | | | | | | | | Change-Id: I6060d3b279c5a01223f0aa0b77f2be9aefa0e200 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * test: Add 5.1.0 bic data for linux-gcc-ia32Sergio Ahumada2013-07-081-0/+17347
| | | | | | | | | | Change-Id: I23ba6b17752e73f9087613e853afb30ae5868f84 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-044-39/+6
|\ \ | |/ | | | | Change-Id: I7d863f4b9921018cd64a56b427bbd3ef36622932
| * Remove S60-configuration from fluidlauncher example.Friedemann Kleint2013-07-041-35/+0
| | | | | | | | | | Change-Id: I95a2619343535740ed744eb1b0f3a51d62e6fb22 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix warning in fluidlauncher example.Friedemann Kleint2013-07-043-4/+6
| | | | | | | | | | | | | | | | "QFSFileEngine::open: No file name specified" for empty icon. Change getImage() to return a QImage to avoid leaking QImages. Change-Id: I0ff3843b32d8faad9dd01bf81a5496a701d555cf Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: Setting navigation bar variablesJerome Pasion2013-06-261-1/+5
| | | | | | | | | | Change-Id: I10a8780589d33db96c86bde1489576e0d23ea52d Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-122-7/+8
|\ \ | |/ | | | | Change-Id: Idc73ff997eb15638c2f9e142e1a09096687a410a
| * Fix warnings found by clang: unused private membersThiago Macieira2013-06-112-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | Classes with no friends should use all its private members. Otherwise, they just take up space for no good reason -- unless it's a placeholder for future use (binary compatibility). These are also private classes, so BC does not apply. qsvgstyle_p.h:198:9: error: private field 'm_colorRendering' is not used [-Werror,-Wunused-private-field] qsvgstyle_p.h:693:25: error: private field 'm_by' is not used [-Werror,-Wunused-private-field] Change-Id: I6aee61b2ba195b251cd1896e41948cc42ff68c46 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-043-2/+5
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf sync.profile Change-Id: I6036f0aa9166f6e7f57192ae92fb2c1322df3845
| * Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-291-1/+1
| | | | | | | | | | Change-Id: I5b2a6423636ea8c89b4bc9563046b0d7163d79c7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Disable compilation of framebufferobject example for OpenGL ES 2.0v5.1.0-rc2v5.1.0-rc1v5.1.0Gunnar Sletta2013-05-282-1/+3
| | | | | | | | | | | | | | Task-number: QTBUG-31345 Change-Id: Ic2659fa90c3928ed75d5768dfb386184b523c8cd Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * sync.profile: Point dependencies to an empty stringSergio Ahumada2013-05-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | 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: I6b6d5efa72d00be636668c393418990a5da45a1b Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-232-28/+25
|\ \ | |/ | | | | Change-Id: I3c7f5f8fa60f24c97060f88b49a76d712e75facd
| * Add changes-5.1.0 fileSergio Ahumada2013-05-131-0/+22
| | | | | | | | | | Change-Id: Ifbfa3c376b398d608c9a73fb5ebd9a0951ee0c5d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Fix bic autotestv5.1.0-beta1Jan Arve Saether2013-04-291-28/+3
| | | | | | | | | | | | | | | | | | | | | | Caused by https://codereview.qt-project.org/54820 I actually tried to avoid this with https://codereview.qt-project.org/54837 but my assumption was wrong. Change-Id: If2b9795809aa0a6a7278eaaea25239ffb40db7b8 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-296-1/+1686
|\ \ | |/ | | | | Change-Id: I9ccc43d03cbd6c7d31c113bc67e5ec91126683cb
| * Fix qsqvgfunctions_wince_p.h include in order make build pass for WEC7.Janne Anttila2013-04-241-1/+1
| | | | | | | | | | | | | | | | | | Apparently the included header name was not renamed when the following patch: https://codereview.qt-project.org/23497 evolved and header filename was changed. Change-Id: Id4ff055046c46b630c2014bc1ba60f36c8520337 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Add license files mandated by (L)GPL.Timo 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: I827ef3c1bcb58b5aa7afbfd985f47a14fbe6ecc9 Reviewed-by: Jason McDonald <macadder1@gmail.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-0/+25
| |\ | | | | | | | | | Change-Id: I3e4b4a41d1d55a2e78ee560c68d6e7cdcc35a6b9
| | * Add changes-5.0.2 filev5.0.2Sergio Ahumada2013-03-201-0/+25
| | | | | | | | | | | | | | | | | | Change-Id: Ie459a12aa8b8b2ca8ee72a78d3e30ed05b4f72cb Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Update module version to 5.2.0Frederik Gladhorn2013-03-281-1/+1
| | | | | | | | | | | | | | | Change-Id: I59dcb635cecd8d7cefb8652002c255a11ae525c4 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-272-2/+2
|\ \ \ | |/ / | | | | | | Change-Id: Ie20ac6e6760ecc3a1b0147db78d40d9d69c21479
| * | Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| | | | | | | | | | | | | | | Change-Id: I3d7cc94abbf06561823d1ec350712e970f5c7186 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Merge branch 'dev' into stableSergio Ahumada2013-03-1910-227/+18
| |\ \ | |/ / |/| | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: Ib22f7e4aad77af52f9d9a57a87b5e6d039c7e18b
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-143-2/+4
|\ \ \ | | | | | | | | | | | | Change-Id: I72bdbfcf34983d76ce9fa2d4c1e1304324615107
* | | | Remove qaccessible2 bic data.Frederik Gladhorn2013-03-131-201/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I2666b04d34ba209ed92984bc2b1a9b30a4fa4b3d Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | | | Doc: Removed reference to non-existing .qdocconfJerome Pasion2013-02-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The qt-modules-default already includes the necessary config. Change-Id: Ib957e57f6ebcb0d55f2fa1f87ec17efdc0516298 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1838-829/+44
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: I9b3bad61dde9a1e21a3501c204b8afc664a04556
* | | | | Fix syncqt warning about qsvgfunctions_wince.h.Friedemann Kleint2013-02-013-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it a real private header. Change-Id: Ic3012a1791f804312d464de0d28b9fc9d641925a Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-285-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Ide31e202399c7cce09bd06e7181361f62dda658c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-17271-19352/+17386
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sync.profile Change-Id: Ibeaf4db17361deb890b154c637a62cfd06b76e26
* | | | | | sync.profile: Point dependencies to 'refs/heads/dev'Sergio Ahumada2012-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: I3911d7fdb41edce772eaebf0e6ed1e2a81515509 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | | * | Make the QtSvg cmake module test independent of QtWidgets.Stephen Kelly2013-03-141-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I28bd2d1ff6ac095701a88ffffdc9478c6fbb0585 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | | * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-03-121-0/+2
| | | |\ \ | | | | |/ | | | | | | | | | | Change-Id: I23025512514720b93651b8aee8acd0036d69ba1a
| | | | * define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: If2aa30a217e8042f8571b93f42d826ddad41d9bd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | | * Merge branch 'stable' into releaseOswald Buddenhagen2013-02-20121-916/+17267
| | | | |\ | | | |_|/ | | |/| | | | | | | Change-Id: I9fa700f17504e7b0e8544d8095e753641bb44a7d
| | | * | Use qmake for package dependency resolution in cmake tests.Stephen Kelly2013-02-262-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | This allows us to remove hardcoded depends information. Change-Id: I362c58cd27341932a7e8ad5e0bb96375249a3ea9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | Remove QPointerBase bic check.Stephen Kelly2013-02-131-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QPointerBase is not public or exported and it is to be removed Change-Id: Ied86966abb0bb09cca314cdd099e2b93b5f82c05 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | fix doc page urlsOswald Buddenhagen2013-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | they are versioned nowadays Change-Id: I0ceda017e0d3124cc28b97f190582dc3cc533304 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-051-5/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibb6e0dd150c93f9ddaaa501ed73245c6ba3b223f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | purge useless doc/global dirOswald Buddenhagen2013-02-053-751/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | these files are part of the default qdoc settings already. Change-Id: Ifd420559b2bff42cb67b2f5d0909e8036bdb7e95 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | Merge branch 'release' into stableSergio Ahumada2013-01-312-31/+2
| | |\ \ | | | |/ | | | | | | | | Change-Id: I8824856bf88d79c94971e621e04d00b8aa502e14
| | | * Update changes file for 5.0.1 releasev5.0.1Sergio Ahumada2013-01-231-30/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I03d2b06526e207848dee31b9ae2dcc0c0f179972 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | | * doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia6e5de4551e056b404191688c6913053c9844339 Reviewed-by: hjk <qthjk@ovi.com>
| | | * Merge branch 'stable' into releaseSergio Ahumada2013-01-0911-24/+73
| | | |\ | | | | | | | | | | | | | | | Change-Id: I6ae8209211f9a294681ea04dff070543957d1053
| | | * | point dependencies to 'release' branchesSergio Ahumada2012-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I981bc4971bbf67456a3ad86b038030f43c5653ef Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
View Lorry Controller Status