summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
| * 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>
* | Bump qtsvg version to 5.3.0Thiago Macieira2013-09-241-1/+1
|/ | | | | Change-Id: I706444eb0f7516bf0e714aa8504e73e38e888998 Reviewed-by: Sergio Ahumada <sergio.ahumada@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-052-1/+29
|\ \ | |/ | | | | | | | | | | 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>
| * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-261-0/+25
| |\ | | | | | | | | | Change-Id: I5d24c988e8c7d767e18e54344f001d1145e99a5b
| | * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-231-0/+25
| | | | | | | | | | | | | | | Change-Id: I397cf428dcf41092673b6b45e1bf5bfb39db6cbf Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-231-1/+1
| |/ | | | | | | | | Change-Id: Iad84e8a461e382e30db59fd33d8ef3240225392c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-113-1/+17355
|\ \ | |/ | | | | Change-Id: I1103984f1b0144df17ef4c5d7a1f3b3dd7a6e762
| * Add a unit test for testing Qt in its install location.Stephen Kelly2013-07-102-1/+8
| | | | | | | | | | Change-Id: I6060d3b279c5a01223f0aa0b77f2be9aefa0e200 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * test: Add 5.1.0 bic data for linux-gcc-ia32Sergio Ahumada2013-07-081-0/+17347
| | | | | | | | | | Change-Id: I23ba6b17752e73f9087613e853afb30ae5868f84 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-044-39/+6
|\ \ | |/ | | | | Change-Id: I7d863f4b9921018cd64a56b427bbd3ef36622932
| * Remove S60-configuration from fluidlauncher example.Friedemann Kleint2013-07-041-35/+0
| | | | | | | | | | Change-Id: I95a2619343535740ed744eb1b0f3a51d62e6fb22 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
View Lorry Controller Status