summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-101-5/+0
|\ | | | | | | Change-Id: I1acc7b8d54e8db1a3bec01c31c755032d24e8e64
| * Remove unused pmKey functionv5.2.1Thiago Macieira2014-01-091-5/+0
| | | | | | | | | | | | | | Found by Clang 3.4. Change-Id: Ie4e9fc535ee44caae561aacdc245c64ea5b30b46 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-061-0/+1
|\ \ | |/ | | | | Change-Id: Iebfffe157538b0a0573e9bfbed7eeac6f53390b1
| * Enable -Werror for all of qtsvgThiago Macieira2013-12-291-0/+1
| | | | | | | | | | Change-Id: Ica038c81648e3d3c7c2418aacf40eef1f62602b6 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-290-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I96adbf312c94e0f70ccc8d2b676155e1f79a56cb
| * Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
| | | | | | | | | | | | Change-Id: I0b407bf6ad77eadcde69683861db52ba76e2090c Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-0818-57/+8
|\ \ | |/ | | | | Change-Id: I80d1a402dfb6f306748e65f056d4d50cb402ee02
| * Android: Make libQt5Xml.so a default dependency of Qt Svgv5.2.0-rc1v5.2.0Eskil Abrahamsen Blomfeldt2013-11-081-0/+6
| | | | | | | | | | | | | | | | | | | | When we depend on Qt Svg, we probably also want to be able to use the image formats plugin, which also depends on Qt Xml. To make this possible, we add a default dependency on libQt5Xml. Task-number: QTBUG-34586 Change-Id: I59fa54eabb2e4f71d6b89cc1b04b36b704154a9b Reviewed-by: Christian Stromme <christian.stromme@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: Idde504f1ba9d6b5c2b62d31500a19ecc797af94d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * remove pointless #ifndef QT_NO_SVGOswald Buddenhagen2013-10-2916-56/+1
| | | | | | | | | | | | | | the way to disable the feature is to not compile the module. Change-Id: I96f18d037243f7d6e3b3cb2c23922cc4c05c30a8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Bump qtsvg version to 5.3.0Thiago Macieira2013-09-241-1/+1
|/ | | | | Change-Id: I706444eb0f7516bf0e714aa8504e73e38e888998 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Merge remote-tracking branch 'origin/stable' into devv5.2.0-beta1v5.2.0-alpha1Sergio Ahumada2013-09-181-0/+1
|\ | | | | | | Change-Id: Id6b68aa089880a59f2e8e192e35d47dd90a67247
| * Doc: Define example install path in .qdocconfold/5.1Topi Reinio2013-09-181-0/+1
| | | | | | | | | | | | | | | | | | Example install path under QT_INSTALL_EXAMPLES needs to be defined in .qdocconf to generate valid projectPath values in example manifest files. Change-Id: I870cde7f416f465f06e6534c94e92b02b32e1b41 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-08-052-1/+29
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I722d07e0de5ac4578867e5fdd2a9ee7779776b72
| * fix shadow build with -qt-zlib and pre-generated headersOswald Buddenhagen2013-07-301-1/+4
| | | | | | | | | | | | Task-number: QTBUG-32641 Change-Id: Ifefa62ff8ce50207de47caf958c96f8b033ebc23 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-261-0/+25
| |\ | | | | | | | | | Change-Id: I5d24c988e8c7d767e18e54344f001d1145e99a5b
| | * 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>
View Lorry Controller Status