summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-stagingQt Continuous Integration System2011-05-2317-6/+88
|\ \ | |/ | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging: More examples adjusted to Symbian and Maemo5. (cherry picked from commit a97b9620a584c9b1a2e006873183526b3d7e001e) Squashed commit of changes from the 4.8-temp branch. Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
| * More examples adjusted to Symbian and Maemo5.David Boddie2011-05-231-0/+5
| | | | | | | | (cherry picked from commit a97b9620a584c9b1a2e006873183526b3d7e001e)
| * Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-203-0/+33
| |
| * Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-2013-6/+50
| | | | | | | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-stagingQt Continuous Integration System2011-05-201-2/+2
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging: Fix compile warning in tests.
| * Fix compile warning in tests.Friedemann Kleint2011-05-201-2/+2
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-stagingQt Continuous Integration System2011-05-201-2/+0
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging: Removed unnecessary message from .pro file
| * Removed unnecessary message from .pro fileEckhart Koppen2011-05-201-2/+0
| | | | | | | | | | | | Leftover from version number bump, not needed anymore. Reviewed-by: TrustMe
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-stagingQt Continuous Integration System2011-05-141-0/+8
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging: Honor -nomake for examples and demos
| * Honor -nomake for examples and demosEckhart Koppen2011-05-131-0/+8
| | | | | | | | | | | | Don't build or install demos and examples when they are disabled. Reviewed-by: TrustMe
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-stagingQt Continuous Integration System2011-05-131-3/+3
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging: Update module version number to 5.0.0
| * Update module version number to 5.0.0Eckhart Koppen2011-05-131-3/+3
| | | | | | | | Updated .pri file variables
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-stagingQt Continuous Integration System2011-05-121-1/+2
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging: tests: build autotests by default for qtsvg
| * tests: build autotests by default for qtsvgRohan McGovern2011-05-121-1/+2
| | | | | | | | | | | | | | Configure Qt with `-nomake tests' if you don't want the tests. Reviewed-by: Jason McDonald Change-Id: I4f0bdfb1bc06b80bc04b111b242e491fd7835e20
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-stagingQt Continuous Integration System2011-05-113-0/+5
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging: Add QTSVG_VERSION macro for qtsvg
| * Add QTSVG_VERSION macro for qtsvgLiang Qi2011-05-113-0/+5
| | | | | | | | | | | | | | Provide version info for each library. Task-number: QTMODULARIZATION-44 Reviewed-by: axis
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-stagingQt Continuous Integration System2011-05-054-6/+12
|\ \ | |/ | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging: Added .tag file with Git revision. Use private headers Add module.prf, and install MODULE_PRI for each module
| * Added .tag file with Git revision.axis2011-05-032-0/+2
| |
| * Use private headersMarius Storm-Olsen2011-05-022-6/+6
| |
| * Add module.prf, and install MODULE_PRI for each moduleMarius Storm-Olsen2011-05-021-0/+4
|/ | | | Output warning if not present
* Added dependency information to the sync.profile.axis2011-04-271-0/+12
|
* Add .gitignore to each moduleaxis2011-04-271-0/+261
|
View Lorry Controller Status