summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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-051-1/+4
|\ \ | |/ | | | | | | | | | | 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>
* | 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>
* | Doc: Setting navigation bar variablesJerome Pasion2013-06-261-1/+5
|/ | | | | Change-Id: I10a8780589d33db96c86bde1489576e0d23ea52d Reviewed-by: Martin Smith <martin.smith@digia.com>
* 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>
* 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>
* 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-1829-39/+39
|\ | | | | | | Change-Id: I9b3bad61dde9a1e21a3501c204b8afc664a04556
| * fix doc page urlsOswald Buddenhagen2013-02-051-1/+1
| | | | | | | | | | | | | | they are versioned nowadays Change-Id: I0ceda017e0d3124cc28b97f190582dc3cc533304 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-051-5/+5
| | | | | | | | | | Change-Id: Ibb6e0dd150c93f9ddaaa501ed73245c6ba3b223f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Merge branch 'release' into stableSergio Ahumada2013-01-311-1/+1
| |\ | | | | | | | | | Change-Id: I8824856bf88d79c94971e621e04d00b8aa502e14
| | * doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-121-1/+1
| | | | | | | | | | | | | | | Change-Id: Ia6e5de4551e056b404191688c6913053c9844339 Reviewed-by: hjk <qthjk@ovi.com>
| * | Fix module name format in file headersSze Howe Koh2013-01-2928-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Change-Id: I418bbd3817d433a1b82f0f0fea68f2235d2abc5a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | Doc: Fix module name formatSze Howe Koh2013-01-264-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Change-Id: Iec74520d922bf87241eca8e12698ed3fbff84367 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | 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>
* | make use of qtHaveModule()Oswald Buddenhagen2013-01-113-3/+3
| | | | | | | | | | Change-Id: Idd8bca1e8e9bb183bc6725b9a9d6a220d609869d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Update copyright year in Digia's license headersSergio Ahumada2013-01-1037-37/+37
|/ | | | | | Change-Id: Icf9d15a0f1f38ab60f0dd8fc2bc6ac936dd7dc62 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix a bad virtual overrideThiago Macieira2013-01-071-2/+2
| | | | | | | | | Problem found by Clang. It took me a while to notice the missing "s" qsvggenerator.cpp:177:10: error: 'QSvgPaintEngine::drawImage' hides overloaded virtual function [-Werror,-Woverloaded-virtual] Change-Id: If95e299f12dea62344efee4a2c542b6474314b0e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Bump Qt version to 5.0.1Sergio Ahumada2013-01-021-4/+4
| | | | | Change-Id: If9d7570e83aea83399f306f4a21ea0e2c2ec0eab Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix crash when running in a QGuiApplicationAlbert Astals Cid2012-12-201-5/+7
| | | | | | | | | | | | A QGuiApplication has no style so crashes on a null pointer or asserts in qtbase Changed test to not depend on widgets so we get a QGuiApplication instead of a QApplication Change-Id: Ib4dcc8f8679d3e6b8c11f7ccd5b2539c9de0803b Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: David Faure (KDE) <faure@kde.org>
* Doc: Capitalize "Qt SVG" properlySze Howe Koh2012-12-135-12/+12
| | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Change-Id: I9a7a30f45a56f8700498cb382899e2139689b998 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Entered hardcoded url for SVG 1.2 TinyNico Vertriest2012-12-131-1/+1
| | | | | | | | Corrected in svgrendering.qdoc Task-number: QTBUG-27512 Change-Id: Iae880281be82a8ac8ac20b717676750a4cd84f69 Reviewed-by: Jerome Pasion <jerome.pasion@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>
* 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-041-4/+1
| | | | | Change-Id: I0cb3dc45fea1fc5af376622a6bc90316f987126b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* 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>
* Doc: Modularized Qt Svg documentationGeir Vattekar2012-10-258-8/+203
| | | | | | Change-Id: I2b503ec04a0a4bf800f62c8d3dc2bf1675293add Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* make compile with -no-guiTasuku Suzuki2012-10-151-1/+1
| | | | | Change-Id: Ie19909aac156a0df4c1c07ed97b3c2fd3f678287 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2431-743/+743
| | | | | | | | 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>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-113-6/+0
| | | | | 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>
* 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>
* Remove obsolete use of Q_WS_QWS.Stephen Kelly2012-07-261-9/+2
| | | | | Change-Id: I9733a86f079ffde911840eb37136f2c02cb96c76 Reviewed-by: Samuel Rødal <samuel.rodal@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-101-1/+1
| | | | | | | 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>
* build system cleanupsOswald Buddenhagen2012-06-233-13/+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-231-2/+1
| | | | | Change-Id: Id45979da7bda207a5cff97516e8ba5f1bca03bd3 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
View Lorry Controller Status