summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-218-39/+97
| |\ | | | | | | | | | Change-Id: I62ad6176f085d17152387d2a2ed83a7d9744d4a6
| | * Export private symbols for use from other Qt modulesv5.4.0-rc1v5.4.05.4.0Louai Al-Khanji2014-11-188-39/+97
| |/ | | | | | | | | Change-Id: I74aa76cb485cb652eba04ff2387165bab9663c99 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-274-8/+5
|\ \ | |/ | | | | Change-Id: I1ed84131c65cb9f047a0f393ebd845282daad499
| * Correctly handle Miter joins in all casesLars Knoll2014-10-203-7/+4
| | | | | | | | | | | | | | | | SVG uses SvgMiterJoin, not the Qt definition of miter joins at all times. Change-Id: I85b8e13609fa37384f09457f724a42d720769028 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| * Don't stroke a path if it's not specified in the SVGLars Knoll2014-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The code in the svg renderer is using a QPen with it's brush set to Qt::NoBrush as a hack to indicate that we don't have a stroke to paint, but to nevertheless use QPen to keep track of state. So when rendering, we have to check for the pen having no brush and in that case not draw anything. Task-number: QTBUG-36767 Change-Id: Ib622c7d0108e7360437f57853f11c65190c16773 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-204-4/+13
|\ \ | |/ | | | | Change-Id: I521c0f85547f8a3272d201e2c7d48341bbf9034c
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-142-1/+10
| |\ | | | | | | | | | Change-Id: Ideff1b627a310a85d728d74ed25b83e7de5352fe
| | * fix crash on malformed SVG5.3Joerg Bornemann2014-10-062-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a gradient that references itself via xlink:href we encountered an infinite recursion, and eventually a stack overflow. Now we print a warning and ignore the invalid link. Task-number: QTBUG-35387 Change-Id: Id72800eaa267d015a471df284245861ed8bc94cd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Remove example for WinRTMaurice Kalinowski2014-10-061-0/+3
| | | | | | | | | | | | | | | | | | | | | Change-Id: Iaf1109eb70c892aa819775f2773168633c62af67 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> (cherry picked from commit b6ba8a7448148794f4a36158003a3d5dad7f1e6c) Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
| * | Doc: Applied title case to section1 titlesv5.4.0-beta1Nico Vertriest2014-10-102-3/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-41250 Change-Id: I32a25f6c524503cf6de5e9349d4817747bafe076 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | QSvgGenerator: make use of the <circle> and <ellipse> elementsJoerg Bornemann2014-10-071-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][][QSvgGenerator] Make use of the <ellipse> element for drawing ellipses. Ellipses that are circles are rendered using the <circle> element. Task-number: QTBUG-1359 Change-Id: I3d451e8670202be8ffb5c4feb8523aaf05bfbdfb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | | QSvgGenerator: make use of the <rect> elementJoerg Bornemann2014-10-073-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][][QSvgGenerator] Make use of the <rect> element for drawing rectangles instead of generating a number of path strokes. Task-number: QTBUG-1359 Change-Id: I54163a13f66089c7ff3d29953ba3e923e3983517 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-09-197-4/+69
|\ \ \ | |/ / | | | | | | Change-Id: I75941126eb0ea28d1190c42e5267c1d6e427a164
| * | Fix shadow build behavior of fluidlauncher exampleAlex Blasche2014-09-195-3/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All files are embedded into a qrc file. The image lookup first assumes that local dirs are used. If nothing is found the lookup moves to the qrc file. This enables flexibility whereby the app can still be customized after having been built. Task-number: QTBUG-28377 Change-Id: I99371ecce08a45321e475a7c32d5b368716bdb18 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
| * | Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Frederik Gladhorn2014-09-180-0/+0
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-160-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4017abfde368e92640a3453fc1b7127d3efb1b7b
| | | * Bump versionFrederik Gladhorn2014-08-291-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ie3b19238bc81eec11b42ec6524935784e35abbb8
| * | | Fix drawGlyphRun on a QSvgGeneratorAllan Sandfeld Jensen2014-09-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make QSvgPaintEngine::drawTextItem handle the case where a text-item has no chars but only glyphs, like it will when using drawGlyphRun. Task-number: QTBUG-39953 Change-Id: Id912c11f8830a450279943de657546e5cee762f3 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * | | Remove qtdemo from gitignoreRainer Keller2014-09-171-1/+0
| |/ / | | | | | | | | | | | | | | | | | | QtDemo was removed with a commit in qtdoc. Change-Id: Ieedaac1e4f7bfcbc1c838a91695b64adcc783549 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-08-2858-1708/+1067
|\ \ \ | |/ / | | | | | | Change-Id: I51564e7cdddfbcebdfcbd8cd4a0f066b305a696a
| * | Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-2558-1708/+1067
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I847adeea20fd98e5c9a18b8c44a15de84283f216 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | | Bump versionOswald Buddenhagen2014-08-091-1/+1
|/ / | | | | | | Change-Id: I1ac4468871ee86c7e97d330141c5046dc1c63817
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
| | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I5dd19c5ee43012f30b932e8f2417cfd8ac6c9330 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Remove example for WinRTMaurice Kalinowski2014-07-071-0/+3
| | | | | | | | | | Change-Id: Iaf1109eb70c892aa819775f2773168633c62af67 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/devFrederik Gladhorn2014-06-260-0/+0
|\ \
| * \ Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-260-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I014c0a4779038dd5c193208513c99d88d8b14496
| | * Bump versionv5.3.25.3.2Oswald Buddenhagen2014-06-181-1/+1
| | | | | | | | | | | | Change-Id: Ifecaca6860d75f2f834673dd655d6d0bfff06df3
* | | qtsvg: Disable framebuffer example for dynamic gl buildsLaszlo Agocs2014-06-261-1/+1
|/ / | | | | | | | | | | | | | | Examples relying on OpenGL 1.x cannot be used in dynamic OpenGL builds. Therefore we just disable them, like in ES builds. Change-Id: Ifdd773f4aa4dc317fad1912b40991e129ded05d9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-149-181/+264
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic8f6fce9251acf4fbd0e7d5c3996ab2defb81107
| * Remove obsolete dependency on QtXmlv5.3.1stable5.3.1Alessandro Portale2014-05-205-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | A while a go, QtSvg was changed to use the QXmlStream* classes from QtCore. Now, only tests/auto/qsvggenerator is left with a QtXml dependency. This patch also reverts commit b719b93770393bbf20251e1dffc70498061e612c Change-Id: I67417a27aa66a2db6d1985cad73e5bab806ad7d2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Remove dependency of the SVG icon engine plugin on QtWidgets.Friedemann Kleint2014-05-163-10/+6
| | | | | | | | | | | | | | | | | | Use the virtual QGuiApplicationPrivate::applyQIconStyleHelper() introduced by commit 6c06e14a49773ce5572935864ed6b9be219c6103 in qtbase to adapt the icon according to the style. Change-Id: I7c429f818c012c58118c64cc3b20a87fcb712877 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-142-2/+2
| |\ | | | | | | | | | Change-Id: Ie91a74b2efaa6e53f023a77dd28389960d5550b2
| | * Let svg plugins extend svg modulev5.3.0-rc1v5.3.0release5.3.0Richard Moe Gustavsen2014-05-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svg plugins are by default not linked together with QtGui since its usage is rare. But when the pro file contains Qt += svg, then its the opposite; The application is likely to need the svg plugins. Many of the examples shipped with the SDK fails building on iOS (e.g accelbubble) because of this. Change-Id: I83873d5405fde2b3d38e836057d55fcc2ceb9b6c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-231-1/+1
| | | | | | | | | | | | | | | Change-Id: I413b22c01336204543d0c3f2ae65a58c456bd96e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Examples: Use yr.no API for the embedded/weatherinfo exampleCaroline Chao2014-04-151-159/+252
| |/ | | | | | | | | | | | | | | | | | | Since the google API is no longer available Task-number: QTBUG-38041 Change-Id: I8ef91a047cade27856579cf871efb5e10afd2350 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-112-0/+2
|\ \ | |/ | | | | Change-Id: I33ee624e7f1e50faeff048a876a691188197fcad
| * avoid that SVG-based plugins are automatically linked to static appsOswald Buddenhagen2014-04-092-0/+2
| | | | | | | | | | | | | | these plugins are relatively unlikely to be needed, so exclude them. Change-Id: I57461ccdc9a7114444a2f623328239e580e4c2e9 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-241-0/+3
|\ \ | |/ | | | | Change-Id: I5448195955ebadcbac6de7cc34ab8e40bd45ef56
| * Fixes: runtime warnings when trying to render 0-size iconv5.3.0-beta1aavit2014-03-171-0/+3
| | | | | | | | | | | | Task-number: QTBUG-37035 Change-Id: I014988cdb57a2001685a8d50d79ee103322ed021 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
|/ | | | | | Change-Id: I3e07d71d0caca0253923d5f9eab90e03902c9d47 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Replace win32-g++ with mingw scopev5.3.0-alpha1Kai Koehne2014-02-081-1/+1
| | | | | | | | | | Commit 773dd01 in qtbase introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. (see 278152fff for a similar commit in qtbase). Change-Id: I430ab289af99e96cd6ed6edfd683258defcb13a4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-170-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id5bef032b66a051e3a6e707abae442ccd2610c84
| * Bump MODULE_VERSION to 5.2.2old/5.2Sergio Ahumada2014-01-161-1/+1
| | | | | | | | | | Change-Id: I0145b33ec2f7cec39b894ea512e2c1119b99dba1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-101-5/+0
|\ \ | |/ | | | | Change-Id: I1acc7b8d54e8db1a3bec01c31c755032d24e8e64
| * Remove unused pmKey functionv5.2.1Thiago Macieira2014-01-091-5/+0
| | | | | | | | | | | | | | Found by Clang 3.4. Change-Id: Ie4e9fc535ee44caae561aacdc245c64ea5b30b46 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-061-0/+1
|\ \ | |/ | | | | Change-Id: Iebfffe157538b0a0573e9bfbed7eeac6f53390b1
| * Enable -Werror for all of qtsvgThiago Macieira2013-12-291-0/+1
| | | | | | | | | | Change-Id: Ica038c81648e3d3c7c2418aacf40eef1f62602b6 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-290-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I96adbf312c94e0f70ccc8d2b676155e1f79a56cb
| * Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
| | | | | | | | | | | | Change-Id: I0b407bf6ad77eadcde69683861db52ba76e2090c Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-0818-57/+8
|\ \ | |/ | | | | Change-Id: I80d1a402dfb6f306748e65f056d4d50cb402ee02
View Lorry Controller Status