summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Add tst_headersclean for each moduleLiang Qi2011-04-274-0/+72
|
* Modularized tst_compilerwarningsLiang Qi2011-04-271-0/+52
|
* Modularized tst_bic and add some helper functions for global testLiang Qi2011-04-271-0/+5
|
* Introduced the QT.<module>.plugins variable to module profiles.axis2011-04-271-0/+1
|
* Adapted guiapplauncher test to modularized Qt.axis2011-04-272-0/+4
| | | | | Now it reads the test cases from text files in each repository instead.
* Added QT.<module>.imports support to module profiles.axis2011-04-271-0/+1
|
* Compile and install QtSvg examplesMarius Storm-Olsen2011-04-271-0/+5
|
* Corrected include.axis2011-04-271-1/+1
|
* Make each module refer to its own bin/Marius Storm-Olsen2011-04-271-0/+1
| | | | | | | Since modules cannot rely on QtCore having a build directory, nor can they build the applications directly into $$[QT_INSTALL_BINS] each module needs their own bin/. Add this path to each module's pri file, so others can use their applications
* Extended module profiles.axis2011-04-271-0/+1
| | | | Each module now sets the QT_CONFIG variable itself.
* Move QtSvg into a separate repositoryLiang Qi2011-04-275-8/+38
|
* Moved to using a feature profile instead of direct inclusion.axis2011-04-278-8/+8
|
View Lorry Controller Status