summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* make use of qt_headersclean.prfv5.0.0-rc2Oswald Buddenhagen2012-12-112-66/+2
| | | | | Change-Id: I09f4401d4265a7aa3127a90830f9c2cc190869e3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add PLUGIN_CLASS_NAME to qtsvg pluginsMiikka Heikkinen2012-12-102-0/+2
| | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: Icfcc07e659c7d07342a7892923d485b54321eae1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Use the bundled zlib in QtCore, if present.Debao Zhang2012-12-1046-19011/+1
| | | | | | | | | | | | | | src/3rdparty/zip is used for windows to build QtSvg under normal builds. See sha: 6cdba02f6c4fc8c6baab7e03e0a2bedcb9a2d334 But QtCore has provided the bundled zlib headers for external access and exported its public symbols when Qt is configured under normal builds on windows So there is no need to keep a seperate 3rdparty/zip copy any more. Change-Id: Idf9cbce4c28a929f6dc6f7b25e22b28c1165fb55 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* QtSvg: Fix link to the designer manual.David Schulz2012-12-071-1/+2
| | | | | Change-Id: I0022793366f377bf5bff2165c327346e6d30f8a5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Centralize and fixup qtsvg example sources install targetshjk2012-12-06142-100/+54
| | | | | | | This follows suit with aeb036e in qtbase. Change-Id: I2e64dcce15b3b39f98395df5627cf0839debdf99 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* sync.profile: Point dependencies to 'refs/heads/stable'v5.0.0-rc1Sergio Ahumada2012-12-041-1/+1
| | | | | | | | | | | We should test stable branches against stable branches only. At some point we should automate the merges from dev->stable->release and decide how to handle possible merge conflicts. This is good enough for the time being. Change-Id: I49f7f2a610aa586170b5f51089cb5479bf5d9b82 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* remove unnecessary harfbuzz include referenceOswald Buddenhagen2012-12-041-2/+0
| | | | | | | core-private already does that. Change-Id: I966848d7a148bf9d08e0c381d878871306586770 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove symbian vestigesOswald Buddenhagen2012-12-043-10/+5
| | | | | Change-Id: I0cb3dc45fea1fc5af376622a6bc90316f987126b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Change Nokia email and url to Qt ProjectSergio Ahumada2012-11-271-2/+2
| | | | | Change-Id: I082c5c71f368bedf135e626e47e84e6d282ab39a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix building of installed examples.Friedemann Kleint2012-11-2113-17/+44
| | | | | | | | | - Correct install paths - Add missing resources. Task-number: QTBUG-27977 Change-Id: Ie31cc31a208393dd8dfce87b067b81d986dc946e Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-207-31/+269
|\ | | | | | | Change-Id: I4e5b2aec69abeaf87ae694e1784c296bf1d0a5b1
| * Doc: Adding documentation from qtdoc repositoryJerome Pasion2012-11-165-1/+246
| | | | | | | | | | | | | | | | | | -snippets -license information -overview Change-Id: I75ec50cfd4f1ef3d8753a3c14b34dc748adf9b54 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * Doc: Enabling "make docs" for Qt SVG.Jerome Pasion2012-11-162-30/+23
|/ | | | | | | -uses QT_INSTALL_DOCS for the install directory Change-Id: I508390fe4bb2a2be352f50baf18cc967c43d31cf Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* adjust to qt_plugin.prf changesv5.0.0-beta2Oswald Buddenhagen2012-11-012-8/+4
| | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. Change-Id: Ib813d8bc48dad023322c476ca6f93bae4effa62a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* CMake: Remove obsolete test_modules testStephen Kelly2012-11-013-74/+0
| | | | | | | The generated module_includes test is a super-set of this test. Change-Id: Ifc4ab1faca4c7ee6eedca2b6a40accdda4df0a44 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* CMake: Test module includesStephen Kelly2012-10-291-0/+6
| | | | | Change-Id: I49a7e136df65bdfa3c62f72dd0a1cd502706bc48 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Doc: Modularized Qt Svg documentationGeir Vattekar2012-10-2546-21/+169
| | | | | | Change-Id: I2b503ec04a0a4bf800f62c8d3dc2bf1675293add Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* tst_qsvggenerator: fixed failure after change to default QPenRohan McGovern2012-10-252-3/+3
| | | | | | | | | Default SVG output was affected by qtbase commit b213d5bfa3a8ed81077cd8eaf229764ff2f1b346. Update autotest to the new default. Change-Id: Ie44d47b8dda4405142e024ea9241f9a054596a10 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* make compile with -no-guiTasuku Suzuki2012-10-151-1/+1
| | | | | Change-Id: Ie19909aac156a0df4c1c07ed97b3c2fd3f678287 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* HTML template: Updated copyright notice from Nokia to Digia PlcJerome Pasion2012-09-262-29/+4
| | | | | Change-Id: Iff6d7f5f03cfa00a98fd966beeaee1ad2d1c3b74 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-24100-1717/+1717
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie28eae89f2ad032f174ff840cc6a44d8dd511eed Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Adding documentation templates from qtbaseJerome Pasion2012-09-213-0/+776
| | | | | | Task-number: QTBUG-27293 Change-Id: I7bb9d45b02aee0f9616bdab7b80837b2587e608b Reviewed-by: Martin Smith <martin.smith@digia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-114-6/+1
| | | | | Change-Id: I03f7850e1cda2766c19a7ed82f0de6577cca5210 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove usage of QT_MAKEDLL from QtSvgJoerg Bornemann2012-09-111-3/+3
| | | | | Change-Id: I14170ebcf4605604c514f126bfa021208d49012d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update the git-archive export optionsThiago Macieira2012-09-032-2/+4
| | | | | | | | | | | | | | The .gitattributes and .gitignore files do not need to be present in packaged sources, as they are for people using the Git repository. People who download tarballs usually don't reimport into Git -- they should just download the actual repositories. Meanwhile, the .tag file is quite useful. Instead of making Git extract to the useless SHA-1 of the $n string, ask git-archive to store the SHA-1 of the commit being packaged. Change-Id: I8b539dfd4fd1f5bb6891470823184037763267ec Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove the Qt 4 BIC data for QtSvg.Thiago Macieira2012-08-3014-201905/+0
| | | | | | | QtSvg from Qt 5 isn't binary compatible with Qt 4 anyway. Change-Id: I261ecf5e656c34ed6bfdd4a5bb12a7cd2d0c5c58 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Doc: Fix memory leak in Text Object Examplev5.0.0-beta1Geir Vattekar2012-08-141-0/+1
| | | | | | Task-number: QTBUG-23345 Change-Id: I53ab7b8b6f9d81b5b8ca9f7f682d0e908231893a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Remove 3rd parameter when calling QGraphicsObject's private ctorThomas Senyk2012-08-130-0/+0
| | | | | | | | | commit 328550ff removed the 3rd parameter (QGraphicsScene*) for QGraphicsItem's ctro, and therefor for QGraphicsObject as well. This required fixing when calling QGraphicsSvgItem's parent ctor. Change-Id: I90ea2b37abcf503e56d1ff5e2b83a4b1db3458dd Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-111-1/+1
| | | | | Change-Id: Ibf8f013a89cf822a83883b2131f7503cffe7a206 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fixed zlib build for WEC7.Janne Anttila2012-08-075-10/+232
| | | | | | | | | | | | | | | | | | | | | | errno in zutil.c is leftover, and not used anymore -> removed. In gzguts.h qsvgfunctions_wince.h are included. To use this header qglobal.h is needed. qsqvgfunctions_wince.h and .cpp contains implementation for missing wince functions etc. Task-number: QTBUG-22507 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> This change is partially cherry picked from commit: 2fa9c829faae10f445fd580627114a8383b753ab Change-Id: Ifef46ab829d12600b967cc3aa87fe2b8342b4f77 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Follow change in qtbase to remove additional scene parameters.Toby Tomkins2012-08-031-2/+2
| | | | | | | | Change 328550ff008da53d865f3a6f245aa4753d1b3527 in qtbase removes obsolete scene argument, make the same change here. Change-Id: I7cd6308f520929d79645eb367aad69cf5e0d8310 Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Set the Qt API level to compatibility mode in all tests.Thiago Macieira2012-08-017-1/+7
| | | | | | | | | | Qt 5.0 beta requires changing the default to the 5.0 API, disabling the deprecated code. However, tests should test (and often do) the compatibility API too, so turn it back on. Task-number: QTBUG-25053 Change-Id: I2ed837da653ddbb9e6c18e9a0d9116be7f320f02 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Remove obsolete use of Q_WS_QWS.Stephen Kelly2012-07-262-18/+2
| | | | | Change-Id: I9733a86f079ffde911840eb37136f2c02cb96c76 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Add the CMake directory created during unit testing to .gitignore.Stephen Kelly2012-07-231-0/+1
| | | | | Change-Id: I462ad0a38aecb9235a8200769868491f63660738 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Test that the package configs for QtSvg work.Stephen Kelly2012-07-205-0/+90
| | | | | Change-Id: Iaf10eba06ef3d6cac5ec78a839278bbe8b3da10d Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QtSvg: Fix examples installs.Friedemann Kleint2012-07-113-4/+8
| | | | | Change-Id: I5b552dd976eb53f9f7ee71d09fd581199eb48b03 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add qtsvgglobal.h containing the Q_SVG_EXPORT macro.Thiago Macieira2012-07-117-1/+76
| | | | | | | | No library other than the core libraries should depend on their export macros being in qglobal.h. Change-Id: Ia4b2c9645d27424c6f1c80163c27a8aad95cf076 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make qtsvg compile with -no-widgetsTasuku Suzuki2012-07-108-14/+15
| | | | | | | disable building all examples, almost all tests and a plugin Change-Id: I80f923dfe2c3cfa6e27b52db092a9770c3d9fbd4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make qtsvg compile with QT_NO_CSSPARSERTasuku Suzuki2012-07-092-6/+60
| | | | | Change-Id: Iea4bb3433232e7350de8d68c504493cca3b34a3d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* use centralized handling of QT_BUILD_PARTSOswald Buddenhagen2012-07-061-22/+1
| | | | | Change-Id: I01b834ce37b2b5053c2e468ef1e088cead5702cf Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* don't reference $$QT_BUILD_TREE - it's unavailable hereOswald Buddenhagen2012-07-061-8/+10
| | | | | | Change-Id: Id8d83b84bec8d8b3e9a70ecead719f730325be2a Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-234-20/+3
| | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - setup of PKGCONFIG* variables (automated now) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless and commented out include and depend paths Change-Id: I6397e2606f741de2d756886a029956682ab09161 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* 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>
View Lorry Controller Status