5 years agoUpdate changes file for 5.0.1 release v5.0.1
Sergio Ahumada [Wed, 9 Jan 2013 14:17:50 +0000 (15:17 +0100)]
Update changes file for 5.0.1 release

Change-Id: I03d2b06526e207848dee31b9ae2dcc0c0f179972
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agodoc: Fix namespace version to 5.0.1 for qhp documentation
Sergio Ahumada [Sat, 12 Jan 2013 08:13:08 +0000 (09:13 +0100)]
doc: Fix namespace version to 5.0.1 for qhp documentation

Change-Id: Ia6e5de4551e056b404191688c6913053c9844339
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoMerge branch 'stable' into release
Sergio Ahumada [Wed, 9 Jan 2013 08:42:07 +0000 (09:42 +0100)]
Merge branch 'stable' into release

Change-Id: I6ae8209211f9a294681ea04dff070543957d1053

5 years agoFix a bad virtual override
Thiago Macieira [Sat, 22 Dec 2012 07:38:55 +0000 (23:38 -0800)]
Fix a bad virtual override

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>
5 years agoclean up example project files wrt QT+=widgets
Oswald Buddenhagen [Fri, 21 Dec 2012 17:21:48 +0000 (18:21 +0100)]
clean up example project files wrt QT+=widgets

Change-Id: Ie39fa6ef364320842e8efe30594f9cfad39fce26
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoAdd changes-5.0.1 file
Sergio Ahumada [Sat, 22 Dec 2012 17:06:26 +0000 (18:06 +0100)]
Add changes-5.0.1 file

Task-number: QTBUG-26065
Change-Id: I6bb5fbbb684809d457ea604bcf6c65dd20c60c43
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoBump Qt version to 5.0.1
Sergio Ahumada [Fri, 21 Dec 2012 23:45:29 +0000 (00:45 +0100)]
Bump Qt version to 5.0.1

Change-Id: If9d7570e83aea83399f306f4a21ea0e2c2ec0eab
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoAdd qmake generated files to .gitignore.
Miikka Heikkinen [Thu, 20 Dec 2012 10:06:48 +0000 (12:06 +0200)]
Add qmake generated files to .gitignore.

Add source files generated by qmake for automatic static plugin
imports to .gitignore.

Change-Id: Ib54f853ace28927e434e4d7b9e3549cfa28163d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoFix crash when running in a QGuiApplication
Albert Astals Cid [Thu, 20 Dec 2012 10:01:22 +0000 (11:01 +0100)]
Fix crash when running in a QGuiApplication

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>
5 years agopoint dependencies to 'release' branches
Sergio Ahumada [Mon, 17 Dec 2012 19:40:11 +0000 (20:40 +0100)]
point dependencies to 'release' branches

Change-Id: I981bc4971bbf67456a3ad86b038030f43c5653ef
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agomake qtbase build dir dependency explicit v5.0.0
Oswald Buddenhagen [Mon, 3 Dec 2012 20:48:42 +0000 (21:48 +0100)]
make qtbase build dir dependency explicit

Change-Id: If18427d317328607615d6a06878930dd2d124ecd
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoDoc: Capitalize "Qt SVG" properly
Sze Howe Koh [Tue, 11 Dec 2012 16:08:17 +0000 (00:08 +0800)]
Doc: Capitalize "Qt SVG" properly

Follow the conventions at

Change-Id: I9a7a30f45a56f8700498cb382899e2139689b998
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoEntered hardcoded url for SVG 1.2 Tiny
Nico Vertriest [Thu, 13 Dec 2012 14:21:01 +0000 (15:21 +0100)]
Entered hardcoded url for SVG 1.2 Tiny

Corrected in svgrendering.qdoc
Task-number: QTBUG-27512

Change-Id: Iae880281be82a8ac8ac20b717676750a4cd84f69
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agomake use of qt_headersclean.prf v5.0.0-rc2
Oswald Buddenhagen [Thu, 6 Dec 2012 16:25:06 +0000 (17:25 +0100)]
make use of qt_headersclean.prf

Change-Id: I09f4401d4265a7aa3127a90830f9c2cc190869e3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoAdd PLUGIN_CLASS_NAME to qtsvg plugins
Miikka Heikkinen [Mon, 10 Dec 2012 12:50:23 +0000 (14:50 +0200)]
Add PLUGIN_CLASS_NAME to qtsvg plugins

Needed for automating static plugin loading.

Task-number: QTBUG-28131
Change-Id: Icfcc07e659c7d07342a7892923d485b54321eae1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoUse the bundled zlib in QtCore, if present.
Debao Zhang [Fri, 7 Dec 2012 09:42:38 +0000 (17:42 +0800)]
Use the bundled zlib in QtCore, if present.

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>
5 years agoQtSvg: Fix link to the designer manual.
David Schulz [Fri, 7 Dec 2012 11:46:17 +0000 (12:46 +0100)]
QtSvg: Fix link to the designer manual.

Change-Id: I0022793366f377bf5bff2165c327346e6d30f8a5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agoCentralize and fixup qtsvg example sources install targets
hjk [Tue, 4 Dec 2012 11:34:19 +0000 (12:34 +0100)]
Centralize and fixup qtsvg example sources install targets

This follows suit with aeb036e in qtbase.

Change-Id: I2e64dcce15b3b39f98395df5627cf0839debdf99
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agosync.profile: Point dependencies to 'refs/heads/stable' v5.0.0-rc1
Sergio Ahumada [Tue, 4 Dec 2012 10:32:53 +0000 (11:32 +0100)]
sync.profile: Point dependencies to 'refs/heads/stable'

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>
5 years agoremove unnecessary harfbuzz include reference
Oswald Buddenhagen [Mon, 3 Dec 2012 20:48:28 +0000 (21:48 +0100)]
remove unnecessary harfbuzz include reference

core-private already does that.

Change-Id: I966848d7a148bf9d08e0c381d878871306586770
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoremove symbian vestiges
Oswald Buddenhagen [Mon, 3 Dec 2012 20:48:00 +0000 (21:48 +0100)]
remove symbian vestiges

Change-Id: I0cb3dc45fea1fc5af376622a6bc90316f987126b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoChange Nokia email and url to Qt Project
Sergio Ahumada [Tue, 27 Nov 2012 18:53:19 +0000 (19:53 +0100)]
Change Nokia email and url to Qt Project

Change-Id: I082c5c71f368bedf135e626e47e84e6d282ab39a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoFix building of installed examples.
Friedemann Kleint [Wed, 21 Nov 2012 14:25:55 +0000 (15:25 +0100)]
Fix building of installed examples.

- Correct install paths
- Add missing resources.

Task-number: QTBUG-27977
Change-Id: Ie31cc31a208393dd8dfce87b067b81d986dc946e
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
5 years agoMerge branch 'newdocs'
Eskil Abrahamsen Blomfeldt [Tue, 20 Nov 2012 09:32:25 +0000 (10:32 +0100)]
Merge branch 'newdocs'

Change-Id: I4e5b2aec69abeaf87ae694e1784c296bf1d0a5b1

5 years agoDoc: Adding documentation from qtdoc repository
Jerome Pasion [Fri, 16 Nov 2012 14:58:09 +0000 (15:58 +0100)]
Doc: Adding documentation from qtdoc repository

-license information

Change-Id: I75ec50cfd4f1ef3d8753a3c14b34dc748adf9b54
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
5 years agoDoc: Enabling "make docs" for Qt SVG.
Jerome Pasion [Fri, 16 Nov 2012 13:25:41 +0000 (14:25 +0100)]
Doc: Enabling "make docs" for Qt SVG.

-uses QT_INSTALL_DOCS for the install directory

Change-Id: I508390fe4bb2a2be352f50baf18cc967c43d31cf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
5 years agoadjust to qt_plugin.prf changes v5.0.0-beta2
Oswald Buddenhagen [Wed, 24 Oct 2012 13:40:39 +0000 (15:40 +0200)]
adjust to qt_plugin.prf changes

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>
5 years agoCMake: Remove obsolete test_modules test
Stephen Kelly [Wed, 31 Oct 2012 13:58:51 +0000 (14:58 +0100)]
CMake: Remove obsolete test_modules test

The generated module_includes test is a super-set of this test.

Change-Id: Ifc4ab1faca4c7ee6eedca2b6a40accdda4df0a44
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoCMake: Test module includes
Stephen Kelly [Fri, 26 Oct 2012 16:08:12 +0000 (18:08 +0200)]
CMake: Test module includes

Change-Id: I49a7e136df65bdfa3c62f72dd0a1cd502706bc48
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoDoc: Modularized Qt Svg documentation
Geir Vattekar [Fri, 5 Oct 2012 13:58:48 +0000 (15:58 +0200)]
Doc: Modularized Qt Svg documentation

Change-Id: I2b503ec04a0a4bf800f62c8d3dc2bf1675293add
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agotst_qsvggenerator: fixed failure after change to default QPen
Rohan McGovern [Thu, 25 Oct 2012 04:17:55 +0000 (14:17 +1000)]
tst_qsvggenerator: fixed failure after change to default QPen

Default SVG output was affected by qtbase commit
b213d5bfa3a8ed81077cd8eaf229764ff2f1b346. Update autotest to the new

Change-Id: Ie44d47b8dda4405142e024ea9241f9a054596a10
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agomake compile with -no-gui
Tasuku Suzuki [Wed, 26 Sep 2012 01:13:01 +0000 (10:13 +0900)]
make compile with -no-gui

Change-Id: Ie19909aac156a0df4c1c07ed97b3c2fd3f678287
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoHTML template: Updated copyright notice from Nokia to Digia Plc
Jerome Pasion [Tue, 25 Sep 2012 10:26:08 +0000 (12:26 +0200)]
HTML template: Updated copyright notice from Nokia to Digia Plc

Change-Id: Iff6d7f5f03cfa00a98fd966beeaee1ad2d1c3b74
Reviewed-by: Martin Smith <martin.smith@digia.com>
5 years agoChange copyrights from Nokia to Digia
Iikka Eklund [Mon, 24 Sep 2012 06:20:05 +0000 (09:20 +0300)]
Change copyrights from Nokia to Digia

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>
5 years agoDoc: Adding documentation templates from qtbase
Jerome Pasion [Fri, 21 Sep 2012 12:35:01 +0000 (14:35 +0200)]
Doc: Adding documentation templates from qtbase

Task-number: QTBUG-27293
Change-Id: I7bb9d45b02aee0f9616bdab7b80837b2587e608b
Reviewed-by: Martin Smith <martin.smith@digia.com>
5 years agocentralize load(qt_build_config)s in .qmake.conf
Oswald Buddenhagen [Mon, 3 Sep 2012 10:13:21 +0000 (12:13 +0200)]
centralize load(qt_build_config)s in .qmake.conf

Change-Id: I03f7850e1cda2766c19a7ed82f0de6577cca5210
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
5 years agoremove usage of QT_MAKEDLL from QtSvg
Joerg Bornemann [Mon, 10 Sep 2012 15:19:08 +0000 (17:19 +0200)]
remove usage of QT_MAKEDLL from QtSvg

Change-Id: I14170ebcf4605604c514f126bfa021208d49012d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoUpdate the git-archive export options
Thiago Macieira [Wed, 29 Aug 2012 19:40:04 +0000 (21:40 +0200)]
Update the git-archive export options

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>
5 years agoRemove the Qt 4 BIC data for QtSvg.
Thiago Macieira [Thu, 30 Aug 2012 11:42:28 +0000 (13:42 +0200)]
Remove the Qt 4 BIC data for QtSvg.

QtSvg from Qt 5 isn't binary compatible with Qt 4 anyway.

Change-Id: I261ecf5e656c34ed6bfdd4a5bb12a7cd2d0c5c58
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
6 years agoDoc: Fix memory leak in Text Object Example v5.0.0-beta1
Geir Vattekar [Tue, 14 Aug 2012 12:47:55 +0000 (14:47 +0200)]
Doc: Fix memory leak in Text Object Example

Task-number: QTBUG-23345
Change-Id: I53ab7b8b6f9d81b5b8ca9f7f682d0e908231893a
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
6 years agoRemove 3rd parameter when calling QGraphicsObject's private ctor
Thomas Senyk [Mon, 13 Aug 2012 10:05:38 +0000 (12:05 +0200)]
Remove 3rd parameter when calling QGraphicsObject's private ctor

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>
6 years agofollow rename of qt_module_config.prf to qt_module.prf
Oswald Buddenhagen [Tue, 7 Aug 2012 17:12:17 +0000 (19:12 +0200)]
follow rename of qt_module_config.prf to qt_module.prf

Change-Id: Ibf8f013a89cf822a83883b2131f7503cffe7a206
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
6 years agoFixed zlib build for WEC7.
Janne Anttila [Mon, 6 Aug 2012 12:45:31 +0000 (15:45 +0300)]
Fixed zlib build for WEC7.

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:

Change-Id: Ifef46ab829d12600b967cc3aa87fe2b8342b4f77
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
6 years agoFollow change in qtbase to remove additional scene parameters.
Toby Tomkins [Fri, 3 Aug 2012 05:24:14 +0000 (15:24 +1000)]
Follow change in qtbase to remove additional scene parameters.

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>
6 years agoSet the Qt API level to compatibility mode in all tests.
Thiago Macieira [Wed, 1 Aug 2012 11:40:04 +0000 (13:40 +0200)]
Set the Qt API level to compatibility mode in all tests.

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>
6 years agoRemove obsolete use of Q_WS_QWS.
Stephen Kelly [Thu, 26 Jul 2012 07:55:33 +0000 (09:55 +0200)]
Remove obsolete use of Q_WS_QWS.

Change-Id: I9733a86f079ffde911840eb37136f2c02cb96c76
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
6 years agoAdd the CMake directory created during unit testing to .gitignore.
Stephen Kelly [Mon, 23 Jul 2012 07:52:22 +0000 (09:52 +0200)]
Add the CMake directory created during unit testing to .gitignore.

Change-Id: I462ad0a38aecb9235a8200769868491f63660738
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
6 years agoTest that the package configs for QtSvg work.
Stephen Kelly [Thu, 19 Jul 2012 12:29:39 +0000 (14:29 +0200)]
Test that the package configs for QtSvg work.

Change-Id: Iaf10eba06ef3d6cac5ec78a839278bbe8b3da10d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
6 years agoQtSvg: Fix examples installs.
Friedemann Kleint [Tue, 10 Jul 2012 13:40:09 +0000 (15:40 +0200)]
QtSvg: Fix examples installs.

Change-Id: I5b552dd976eb53f9f7ee71d09fd581199eb48b03
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoAdd qtsvgglobal.h containing the Q_SVG_EXPORT macro.
Thiago Macieira [Thu, 7 Jun 2012 12:17:07 +0000 (14:17 +0200)]
Add qtsvgglobal.h containing the Q_SVG_EXPORT macro.

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>
6 years agoMake qtsvg compile with -no-widgets
Tasuku Suzuki [Thu, 5 Jul 2012 07:19:00 +0000 (16:19 +0900)]
Make qtsvg compile with -no-widgets

disable building all examples, almost all tests and a plugin

Change-Id: I80f923dfe2c3cfa6e27b52db092a9770c3d9fbd4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoMake qtsvg compile with QT_NO_CSSPARSER
Tasuku Suzuki [Wed, 20 Jun 2012 12:12:42 +0000 (21:12 +0900)]
Make qtsvg compile with QT_NO_CSSPARSER

Change-Id: Iea4bb3433232e7350de8d68c504493cca3b34a3d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agouse centralized handling of QT_BUILD_PARTS
Oswald Buddenhagen [Tue, 3 Jul 2012 19:42:00 +0000 (21:42 +0200)]
use centralized handling of QT_BUILD_PARTS

Change-Id: I01b834ce37b2b5053c2e468ef1e088cead5702cf
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
6 years agodon't reference $$QT_BUILD_TREE - it's unavailable here
Oswald Buddenhagen [Mon, 21 May 2012 10:12:21 +0000 (12:12 +0200)]
don't reference $$QT_BUILD_TREE - it's unavailable here

Change-Id: Id8d83b84bec8d8b3e9a70ecead719f730325be2a
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
6 years agobuild system cleanups
Oswald Buddenhagen [Thu, 12 Apr 2012 10:37:04 +0000 (12:37 +0200)]
build system cleanups

- 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>
6 years agoauto-generate module pris
Oswald Buddenhagen [Thu, 12 Apr 2012 09:17:42 +0000 (11:17 +0200)]
auto-generate module pris

Change-Id: Id45979da7bda207a5cff97516e8ba5f1bca03bd3
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
6 years agofix location of svg file for shadow builds
Oswald Buddenhagen [Wed, 20 Jun 2012 18:13:52 +0000 (20:13 +0200)]
fix location of svg file for shadow builds

Change-Id: I13809b3b1007d32b3114eae3776dbe7fb2693dc9
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
6 years agoremove XFAILs
Oswald Buddenhagen [Wed, 20 Jun 2012 15:14:25 +0000 (17:14 +0200)]
remove XFAILs

tests appear to pass now

Task-number: QTBUG-24139
Change-Id: I29b46950f6d628d51650901fd6621d5d0696be1b
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
6 years agoAdd gui-private to qtsvg tests
Girish Ramakrishnan [Fri, 22 Jun 2012 05:52:11 +0000 (07:52 +0200)]
Add gui-private to qtsvg tests

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>
6 years agoRemove unnecessary systray example.
Gatis Paeglis [Mon, 11 Jun 2012 14:09:20 +0000 (16:09 +0200)]
Remove unnecessary systray example.

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>
6 years agoFixed MSVC compiler warning for zlib when compiling on WEC7.
Janne Anttila [Wed, 2 Nov 2011 07:24:10 +0000 (09:24 +0200)]
Fixed MSVC compiler warning for zlib when compiling on WEC7.

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)

6 years agoFix compilation for -no-widgets option
Tasuku Suzuki [Tue, 22 May 2012 22:03:42 +0000 (07:03 +0900)]
Fix compilation for -no-widgets option

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>
6 years agoQIcon has been moved back to QtGui
Olivier Goffart [Wed, 16 May 2012 21:11:47 +0000 (23:11 +0200)]
QIcon has been moved back to QtGui

Change-Id: I04aaa8ddf09b70e51357403ccad1d5acd08251b6
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
6 years agoPort to the new QUrl API, using QUrlQuery
Thiago Macieira [Wed, 19 Oct 2011 22:08:22 +0000 (00:08 +0200)]
Port to the new QUrl API, using QUrlQuery

Change-Id: I19e2310caeacd62c2316126119238dfc3e7c1c10
Reviewed-by: Richard J. Moore <rich@kde.org>
6 years agoChange uses of {to,from}Ascii to {to,from}Latin1
Thiago Macieira [Thu, 3 May 2012 12:22:55 +0000 (14:22 +0200)]
Change uses of {to,from}Ascii to {to,from}Latin1

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>
6 years agoFix incorrect indents in svg.pro
Janne Anttila [Tue, 17 Apr 2012 09:59:45 +0000 (12:59 +0300)]
Fix incorrect indents in svg.pro

Change-Id: I884b472a2e5f2d726596be8d224c894603a0db7b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
6 years agoRemove Symbian and Maemo code from QtSvg
Janne Anttila [Tue, 17 Apr 2012 10:19:00 +0000 (13:19 +0300)]
Remove Symbian and Maemo code from QtSvg

Change-Id: Ib951c2d3878dc9533131ee6d3dae122c4bbec807
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
6 years agoRemove the usage of deprecated qdoc macros. qt-v5.0.0-alpha1
Casper van Donderen [Thu, 1 Mar 2012 18:14:55 +0000 (19:14 +0100)]
Remove the usage of deprecated qdoc macros.

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>
6 years agoList widgets as an svg module dependency.
Stephen Kelly [Mon, 27 Feb 2012 23:56:16 +0000 (00:56 +0100)]
List widgets as an svg module dependency.

QtWidgets is part of the QtSvg ABI.

Change-Id: Ie34ee8e86624cbc171618a135e53be0ec2e89054
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoclean up qmake-generated project
Oswald Buddenhagen [Tue, 21 Feb 2012 15:33:31 +0000 (16:33 +0100)]
clean up qmake-generated project

remove "header" and assignmets which are defaults or bogus

Change-Id: I241ac3d0d2b1f181616533f3d1528ce541ed5ac7
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
6 years agoUse new plugin system in QtSvg.
Friedemann Kleint [Fri, 17 Feb 2012 15:56:00 +0000 (16:56 +0100)]
Use new plugin system in QtSvg.

Change-Id: I9e588b7907f1d956d1f1feb018d61e375130b2d9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
6 years agoAdd QIcon SVG specific tests to QtSVG module.
Toby Tomkins [Wed, 8 Feb 2012 05:51:07 +0000 (15:51 +1000)]
Add QIcon SVG specific tests to QtSVG module.

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>
6 years agoQtSvg: Fix compile.
Friedemann Kleint [Wed, 1 Feb 2012 10:44:14 +0000 (11:44 +0100)]
QtSvg: Fix compile.

- 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>
6 years agoFixed compile of tst_headersclean
Rohan McGovern [Mon, 30 Jan 2012 23:42:21 +0000 (09:42 +1000)]
Fixed compile of tst_headersclean

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>
6 years agoRemove "All rights reserved" line from license headers.
Jason McDonald [Tue, 24 Jan 2012 05:14:06 +0000 (15:14 +1000)]
Remove "All rights reserved" line from license headers.

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>
6 years agoUpdate obsolete contact address.
Jason McDonald [Fri, 20 Jan 2012 05:18:58 +0000 (15:18 +1000)]
Update obsolete contact address.

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>
6 years agoRemove the use of QT_MODULE()
Gunnar Sletta [Mon, 9 Jan 2012 08:08:12 +0000 (09:08 +0100)]
Remove the use of QT_MODULE()

Change-Id: I28d4814eb4d91c8cca88cea206ad7737dc021f78
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
6 years agoUpdate copyright year in license headers.
Jason McDonald [Thu, 5 Jan 2012 06:04:45 +0000 (16:04 +1000)]
Update copyright year in license headers.

Change-Id: I2dda86020c6d4b3edf8461733b14a95b9e519afc
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
6 years agoFixed compile with OpenGL ES
Rohan McGovern [Fri, 30 Dec 2011 00:43:00 +0000 (10:43 +1000)]
Fixed compile with OpenGL ES

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>

6 years agoUpdate obsolete contact email address.
Jason McDonald [Tue, 20 Dec 2011 06:52:51 +0000 (16:52 +1000)]
Update obsolete contact email address.

Change-Id: Ib36444d99f310a9243b9ac1fd1c5a96357067ba5
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
6 years agoRemove TESTED_CLASS/TESTED_FILES comments from tests.
Jason McDonald [Tue, 6 Dec 2011 00:39:59 +0000 (10:39 +1000)]
Remove TESTED_CLASS/TESTED_FILES comments from tests.

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>
6 years agoRemove SkipMode parameter from QSKIP.
Jason McDonald [Wed, 19 Oct 2011 04:03:20 +0000 (14:03 +1000)]
Remove SkipMode parameter from QSKIP.

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>
6 years agoFixed compile; QDesktopServices -> QStandardPaths
Sergio Ahumada [Tue, 25 Oct 2011 16:54:37 +0000 (18:54 +0200)]
Fixed compile; QDesktopServices -> QStandardPaths

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>
6 years agotests: eliminated usage of qttest_p4.prf
Rohan McGovern [Fri, 7 Oct 2011 05:42:52 +0000 (15:42 +1000)]
tests: eliminated usage of qttest_p4.prf

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>
6 years agoFixed compile for removal of Qt::escape
Rohan McGovern [Thu, 29 Sep 2011 23:04:38 +0000 (09:04 +1000)]
Fixed compile for removal of Qt::escape

Broken by source incompatible change in qtbase,

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>
6 years agoMerge branch 'refactor'
Gunnar Sletta [Tue, 13 Sep 2011 07:32:05 +0000 (09:32 +0200)]
Merge branch 'refactor'

Change-Id: Ie0d0bcdb6f4cd2b157a06e1197aaaad7fd126392

6 years agosupport a toplevel compile
Gunnar Sletta [Mon, 12 Sep 2011 20:12:37 +0000 (22:12 +0200)]
support a toplevel compile

Change-Id: I87b3335793985ea72ee30a840ffe104cbcc8a2f6

6 years agoRefactor branch
Gunnar Sletta [Fri, 26 Aug 2011 06:17:28 +0000 (08:17 +0200)]
Refactor branch

Change-Id: Ib40cc3a98060dfbe1649af23f970afe542f9734c

6 years agoRemove obsolete testlib files from .gitignore
Jason McDonald [Tue, 23 Aug 2011 05:56:34 +0000 (15:56 +1000)]
Remove obsolete testlib files from .gitignore

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>
7 years agoFixed infinite loop when loading certain SVGs.
Kim Motoyoshi Kalland [Mon, 15 Aug 2011 13:51:57 +0000 (15:51 +0200)]
Fixed infinite loop when loading certain SVGs.

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>
7 years agoFixed compile.
Rohan McGovern [Fri, 12 Aug 2011 01:15:31 +0000 (11:15 +1000)]
Fixed compile.

qtbase f2b3dfd1f17952627fce9fde1264207958f87f43 removed

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>
7 years agoMerge demos and examples
Casper van Donderen [Mon, 11 Jul 2011 11:40:02 +0000 (13:40 +0200)]
Merge demos and examples

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
7 years agoUpdate sync.profile dependencies to new syntax
Alan Alpert [Thu, 7 Jul 2011 07:34:29 +0000 (17:34 +1000)]
Update sync.profile dependencies to new syntax

%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>
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging
Qt Continuous Integration System [Mon, 4 Jul 2011 06:14:29 +0000 (16:14 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging:
  examples: avoid OpenGL examples if Qt OpenGL support is disabled

7 years agoexamples: avoid OpenGL examples if Qt OpenGL support is disabled
Rohan McGovern [Mon, 4 Jul 2011 06:07:57 +0000 (16:07 +1000)]
examples: avoid OpenGL examples if Qt OpenGL support is disabled

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging
Qt Continuous Integration System [Thu, 9 Jun 2011 17:43:59 +0000 (03:43 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging:
  Add zlib to src/3rdparty for non-system-zlib builds

7 years agoAdd zlib to src/3rdparty for non-system-zlib builds
Marius Storm-Olsen [Thu, 9 Jun 2011 17:16:26 +0000 (12:16 -0500)]
Add zlib to src/3rdparty for non-system-zlib builds

Required for Windows to build under normal conditions

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging
Qt Continuous Integration System [Tue, 7 Jun 2011 18:52:20 +0000 (04:52 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging:
  Fix usage of QT_SOURCE_TREE

7 years agoFix usage of QT_SOURCE_TREE
Marius Storm-Olsen [Tue, 7 Jun 2011 18:50:18 +0000 (13:50 -0500)]
Fix usage of QT_SOURCE_TREE

Functionality has been moved into qt_example.prf

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging
Qt Continuous Integration System [Tue, 7 Jun 2011 10:48:25 +0000 (20:48 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging

* '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.