summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* auto-generate module prisOswald Buddenhagen2012-06-233-21/+1
| | | | | Change-Id: Id45979da7bda207a5cff97516e8ba5f1bca03bd3 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* fix location of svg file for shadow buildsOswald Buddenhagen2012-06-231-1/+1
| | | | | | Change-Id: I13809b3b1007d32b3114eae3776dbe7fb2693dc9 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* remove XFAILsOswald Buddenhagen2012-06-231-3/+0
| | | | | | | | tests appear to pass now Task-number: QTBUG-24139 Change-Id: I29b46950f6d628d51650901fd6621d5d0696be1b Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add gui-private to qtsvg testsGirish Ramakrishnan2012-06-225-5/+5
| | | | | | | | QWindowSystemInterface will be marked shortly as QPA API. Change-Id: I2615be9439b8f05a36abfdd1e6e9f40735f9a357 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Remove unnecessary systray example.Gatis Paeglis2012-06-1110-645/+1
| | | | | | | | Removing example which is almost identical to the example from the qtbase module. Task-number: QTBUG-26113 Change-Id: Ied83969d4ee9fb8bef1528472957f66593a9f15c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fixed MSVC compiler warning for zlib when compiling on WEC7.Janne Anttila2012-06-051-2/+6
| | | | | | | | | | | WEC7 mkspecs define _CRT_SECURE_NO_DEPRECATE globally. libpng redefined the same macro without checking if it is already defined. Added #ifdef guard to zlib when defining _CRT_SECURE_NO_DEPRECATE. Task-number: QTBUG-22512 Change-Id: I477b24b7bc0ebb4cd8a619b11668eceb0f5064d4 Reviewed-by: aavit <qt_aavit@ovi.com> (cherry picked from commit a0a970447d63e5c9afdb55d179d671d9c24e9061)
* Fix compilation for -no-widgets optionTasuku Suzuki2012-05-237-14/+20
| | | | | | | | | | Disable QSvgWidget and QGraphicsSvgItem when -no-widgets is set. The module doesn't depend on widgets when QT_CONFIG contains no-widgets. QT_NO_SVG* (which is removed in Qt5) is replaced to QT_NO_WIDGETS. Change-Id: I11457a40e96d193269dcc37ac7fdb86f3f7c1958 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QIcon has been moved back to QtGuiOlivier Goffart2012-05-192-2/+2
| | | | | | Change-Id: I04aaa8ddf09b70e51357403ccad1d5acd08251b6 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Port to the new QUrl API, using QUrlQueryThiago Macieira2012-05-051-2/+4
| | | | | Change-Id: I19e2310caeacd62c2316126119238dfc3e7c1c10 Reviewed-by: Richard J. Moore <rich@kde.org>
* Change uses of {to,from}Ascii to {to,from}Latin1Thiago Macieira2012-05-051-1/+1
| | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: I6a7cd331d0fd76461a1e657675733420a75c46f1 Reviewed-by: Richard J. Moore <rich@kde.org>
* Fix incorrect indents in svg.proJanne Anttila2012-04-191-8/+8
| | | | | Change-Id: I884b472a2e5f2d726596be8d224c894603a0db7b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove Symbian and Maemo code from QtSvgJanne Anttila2012-04-1920-307/+5
| | | | | | Change-Id: Ib951c2d3878dc9533131ee6d3dae122c4bbec807 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Remove the usage of deprecated qdoc macros.qt-v5.0.0-alpha1Casper van Donderen2012-03-012-10/+10
| | | | | | | | | | QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: I1ec71bacd7cc75c327c4112c6587a91c3e0b37eb Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* List widgets as an svg module dependency.Stephen Kelly2012-02-281-1/+1
| | | | | | | QtWidgets is part of the QtSvg ABI. Change-Id: Ie34ee8e86624cbc171618a135e53be0ec2e89054 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* clean up qmake-generated projectOswald Buddenhagen2012-02-224-28/+5
| | | | | | | remove "header" and assignmets which are defaults or bogus Change-Id: I241ac3d0d2b1f181616533f3d1528ce541ed5ac7 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Use new plugin system in QtSvg.Friedemann Kleint2012-02-175-8/+17
| | | | | Change-Id: I9e588b7907f1d956d1f1feb018d61e375130b2d9 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add QIcon SVG specific tests to QtSVG module.Toby Tomkins2012-02-099-0/+369
| | | | | | | | | | | | | These tests used to reside in the qtbase module. As they rely on the presence of the QtSVG module to execute they are not run as part of the autotest suite. It makes more sense to place these autotest where they can provide meaningful feedback to commits. Task-number: QTBUG-24139 Task-number: QTBUG-22360 Change-Id: Ib7061598245673ac281e4b10cbe2243977264b6d Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QtSvg: Fix compile.Friedemann Kleint2012-02-014-7/+8
| | | | | | | | | | - Rename of QIconEngineV2 to QIconEngine. - Fix test to run (add column). Change-Id: Iea25847ef7e239927cf5bf1c0ea60454a8d6a158 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fixed compile of tst_headerscleanRohan McGovern2012-01-311-3/+1
| | | | | | | | | Remove contains(QT_CONFIG,svg) test; configure no longer defines this. If we are building this project, we already know QtSvg is enabled. Change-Id: I2fc66d87ad3a8f2af885c6f392c51d064a73a0e5 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3098-98/+98
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I5f2eda9477944e22ec5f6dd07dcb53feaa9fc03b Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-2398-98/+98
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ia89ccb618e630103d60a6e2703e3fbedae0616a6 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove the use of QT_MODULE()Gunnar Sletta2012-01-194-4/+0
| | | | | | Change-Id: I28d4814eb4d91c8cca88cea206ad7737dc021f78 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0598-98/+98
| | | | | | Change-Id: I2dda86020c6d4b3edf8461733b14a95b9e519afc Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed compile with OpenGL ESRohan McGovern2011-12-301-1/+1
| | | | | | | | | The OpenGL example here uses display lists, which is not implemented in OpenGL ES. Therefore, disable it when OpenGL ES is used. Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Change-Id: Id8149b9bfa991711461895bac6559ab368b8138d Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Update obsolete contact email address.Jason McDonald2011-12-281-1/+1
| | | | | | Change-Id: Ib36444d99f310a9243b9ac1fd1c5a96357067ba5 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove TESTED_CLASS/TESTED_FILES comments from tests.Jason McDonald2011-12-064-13/+0
| | | | | | | | | | These comments were mostly empty. Appropriate naming of tests and appropriate placement of tests within the directory tree provide more reliable indicators of what is being tested. Change-Id: I2f0142a7d1744f9b785c49c50d729723d544ff34 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove SkipMode parameter from QSKIP.Jason McDonald2011-11-091-2/+2
| | | | | | | | | | | The SkipMode parameter has been removed from the API in qtbase, so it must be in all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: Iaf72a95164e3464ebc6e974fd5969170def47605 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed compile; QDesktopServices -> QStandardPathsSergio Ahumada2011-10-263-9/+10
| | | | | | | | | Broken by qtbase dfa24768a3243eda68d91f573050bf23f96da2dd. Change-Id: I4d9366a91efcead98fc4d00fdeb567a11e0977d4 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: John Brooks <john.brooks@dereferenced.net>
* tests: eliminated usage of qttest_p4.prfRohan McGovern2011-10-075-24/+14
| | | | | | | | | | | qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: Ia83fc82c005c73b0df48aa8d7b57968be05ad937 Reviewed-on: http://codereview.qt-project.org/6212 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fixed compile for removal of Qt::escapeRohan McGovern2011-09-301-1/+1
| | | | | | | | | | Broken by source incompatible change in qtbase, b863df7de926448cf0057272c16da04b7cfb11ee Change-Id: Ie90a0cbb74f7208945ebcb5d8544c35be698fb36 Reviewed-on: http://codereview.qt-project.org/5818 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Merge branch 'refactor'Gunnar Sletta2011-09-1339-18/+40
|\ | | | | | | Change-Id: Ie0d0bcdb6f4cd2b157a06e1197aaaad7fd126392
| * support a toplevel compileGunnar Sletta2011-09-1222-0/+22
| | | | | | | | Change-Id: I87b3335793985ea72ee30a840ffe104cbcc8a2f6
| * Refactor branchGunnar Sletta2011-08-2617-18/+18
| | | | | | | | Change-Id: Ib40cc3a98060dfbe1649af23f970afe542f9734c
* | Remove obsolete testlib files from .gitignoreJason McDonald2011-08-231-2/+0
|/ | | | | | | Change-Id: I789d394330ce8cdfc2edb3b9b923eb351c4d3140 Reviewed-on: http://codereview.qt.nokia.com/3379 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed infinite loop when loading certain SVGs.Kim Motoyoshi Kalland2011-08-151-1/+1
| | | | | | | | | Task-number: QTBUG-16216 Change-Id: Ic382cf6dba43b3c08db43117e84620b272e5adb6 Reviewed-on: http://codereview.qt.nokia.com/2976 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: aavit <qt_aavit@ovi.com>
* Fixed compile.Rohan McGovern2011-08-121-1/+1
| | | | | | | | | | qtbase f2b3dfd1f17952627fce9fde1264207958f87f43 removed QtXml/qxmlstream.h. Change-Id: I536b42145011746291eab7240bc1f8275edec56d Reviewed-on: http://codereview.qt.nokia.com/2881 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Merge demos and examplesCasper van Donderen2011-07-12104-288/+278
| | | | | | | Change-Id: Iaa84519e5adaa7736b245c831c7cec7ff9453191 Reviewed-on: http://codereview.qt.nokia.com/1419 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
* Update sync.profile dependencies to new syntaxAlan Alpert2011-07-081-8/+5
| | | | | | | | | | %dependencies now has a simpler format of gitmodule => gitref instead of using qt modules and keywords. Change-Id: I785f30e24e0a793218e2e307bdde56067760c515 Reviewed-on: http://codereview.qt.nokia.com/1272 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-stagingQt Continuous Integration System2011-07-041-1/+3
|\ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging: examples: avoid OpenGL examples if Qt OpenGL support is disabled
| * examples: avoid OpenGL examples if Qt OpenGL support is disabledRohan McGovern2011-07-041-1/+3
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-stagingQt Continuous Integration System2011-06-1046-1/+19010
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging: Add zlib to src/3rdparty for non-system-zlib builds
| * Add zlib to src/3rdparty for non-system-zlib buildsMarius Storm-Olsen2011-06-0946-1/+19010
| | | | | | | | Required for Windows to build under normal conditions
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-stagingQt Continuous Integration System2011-06-086-9/+9
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging: Fix usage of QT_SOURCE_TREE
| * Fix usage of QT_SOURCE_TREEMarius Storm-Olsen2011-06-076-9/+9
| | | | | | | | Functionality has been moved into qt_example.prf
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-stagingQt Continuous Integration System2011-06-073-6/+12
|\ \ | |/ | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging: Use feature profile loading instead of direct inclusion. Hardcoded zlib linking options. Fixed DESTDIR after modularization.
| * Use feature profile loading instead of direct inclusion.axis2011-06-073-3/+3
| |
| * Hardcoded zlib linking options.axis2011-06-071-1/+7
| | | | | | | | | | | | This also removes support for non-system based zlib. If we want to support that, it needs some extra work, since it needs access to the source code of zlib.
| * Fixed DESTDIR after modularization.axis2011-06-072-2/+2
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-stagingQt Continuous Integration System2011-05-2463-998/+998
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging: Update licenseheader text in source files for qtsvg Qt module
| * Update licenseheader text in source files for qtsvg Qt moduleJyri Tahtela2011-05-2463-998/+998
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
View Lorry Controller Status