summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release' into old/5.0old/5.0Oswald Buddenhagen2013-04-112-1/+26
|\ | | | | | | Change-Id: I5e30b1e98cd840de29120ce919c32c2fb90df262
| * Add changes-5.0.2 filev5.0.2Sergio Ahumada2013-03-201-0/+25
| | | | | | | | | | | | Change-Id: Ib18e48235ccd9998d29962ab215d4e5154ba68e7 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-03-121-0/+2
|\ \ | |/ | | | | Change-Id: I8554e65aeadcad68decd44163e547a2cd9856871
| * define MODULE_VERSIONOswald Buddenhagen2013-02-281-0/+2
| | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: I4a0a1a29980b67cd1dab32d014c566c649d1d149 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Merge branch 'stable' into releaseOswald Buddenhagen2013-02-20905-941/+2127
| |\ | | | | | | | | | Change-Id: I7984affa29d2dbfcc78cfa6ac63e0646355c86ec
* | | Use qmake for package dependency resolution in cmake tests.Stephen Kelly2013-02-262-2/+2
| |/ |/| | | | | | | | | | | This allows us to remove hardcoded depends information. Change-Id: I5aac8d8e4fe53ad335ab4317c2bca82e9b6e4ede Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Add license files mandated by (L)GPL.Timo Jyrinki2013-02-083-0/+1210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only qtbase includes the required LICENSE files, which are referred to from the code headers. The same files should be distributed as part of all the modules as well, so that the (L)GPL licenses are adhered. These files were wget:d from: https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL Not sanitize-commit clean because those files aren't. Change-Id: I9237ebc08e9a673dea9de81c5ddd348e1a93577e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | use qt_tool.prf for xmlpatterns toolsOswald Buddenhagen2013-02-062-29/+4
| | | | | | | | | | Change-Id: I254cc020c81bcf7d2803ef686b9f450be4d09a39 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-051-1/+1
| | | | | | | | | | Change-Id: I2424061251bc55cc2196c483ba421bef831a36b6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge branch 'release' into stableSergio Ahumada2013-01-312-31/+2
|\ \ | |/ | | | | Change-Id: I36ba2436d653e88a03fcb1e04658e50f8ad8392e
| * Update changes file for 5.0.1 releasev5.0.1Sergio Ahumada2013-01-231-30/+1
| | | | | | | | | | | | | | Change-Id: I3014b6e03cba3fb310f6a7e5c80a0cfad9569082 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-121-1/+1
| | | | | | | | | | Change-Id: Iab36160fc699f5d81e201aacd003b84c1be8a51b Reviewed-by: hjk <qthjk@ovi.com>
| * Merge branch 'stable' into releaseSergio Ahumada2013-01-097-16/+70
| |\ | | | | | | | | | Change-Id: Ie98e2c20c7096ceb1f5a46b4e9fa5b750808ed43
| * | point dependencies to 'release' branchesSergio Ahumada2012-12-181-1/+1
| | | | | | | | | | | | | | | Change-Id: I16bd4661bed3e61f6bc6bbb67ca30cdb6bb33e70 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Doc: Fix "Class QXmlNamePool has no \inmodule command"Sze Howe Koh2013-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | All others in this folder use "\inmodule QtXmlPatterns" Change-Id: I460cba6b91a49e2af00ab909bea5af11919e8386 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Doc: Fix module name formatSze Howe Koh2013-01-255-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Change-Id: I1a8b3cafa9d1b9a6fdde835ae93f5f87b4d3970c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Update copyright year in Digia's license headersSergio Ahumada2013-01-10896-899/+899
| | | | | | | | | | | | | | | | | | Change-Id: I5b7d4c1de139bebfff1b67d216c579835431e5d6 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | make use of qtHaveModule()Oswald Buddenhagen2013-01-101-1/+1
| |/ |/| | | | | | | | | | | Change-Id: Iff51a71f1d24a1372359efcea74d627ae4d471ee Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Add changes-5.0.1 fileSergio Ahumada2013-01-031-0/+51
| | | | | | | | | | | | Task-number: QTBUG-26065 Change-Id: I9937e93a043f871d833903489c45c318fbb82229 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Fix warnings found in qtxmlpatterns by ClangThiago Macieira2013-01-024-14/+14
| | | | | | | | | | | | | | | | | | schema/qxsdstatemachine_tpl_p.h:186:71: error: unused parameter 'input' [-Werror,-Wunused-parameter] expr/qexpression.cpp:139:50: error: unused variable 'end' [-Werror,-Wunused-variable] projection/qdocumentprojector_p.h:84:22: error: 'QPatternist::DocumentProjector::attribute' hides overloaded virtual function [-Werror,-Woverloaded-virtual] Change-Id: I84021e4aa6bdca8dfcaa4c375845ceb24c33818b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Fix annoying warning in qtxmlpatterns about a value too big for the enumThiago Macieira2013-01-021-2/+2
| | | | | | | | | | | | | | | | | | | | api/qcoloroutput_p.h:74:60: error: signed shift result (0xFFFFF00000) requires 41 bits to represent, but 'int' only has 32 bits [-Werror,-Wshift-overflow] The masks don't look right anyway. Let's just hardcode them according to how many colours are used. Change-Id: Idd3438ecab3fb666bd84929fb731011224b9c68e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Add qmake generated files to .gitignore.Miikka Heikkinen2012-12-201-0/+3
|/ | | | | | | | Add source files generated by qmake for automatic static plugin imports to .gitignore. Change-Id: I3cbc4786018dca10c02b20a425a619ac7ad6ec19 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove obsolete DEPENDPATH assignmentsv5.0.0Oswald Buddenhagen2012-12-161-2/+0
| | | | | | | | qmake now adds CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: Ibe763804b4cd451f19bfdac660436772644bf285 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make qtbase source dependency explicitv5.0.0-rc2Oswald Buddenhagen2012-12-121-2/+3
| | | | | Change-Id: I7682d9b75a41f6084834a08db3f37925d5153afe Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make use of qt_headersclean.prfOswald Buddenhagen2012-12-112-66/+2
| | | | | Change-Id: If4dc7b40b9222113cb11d31409a39272004c38d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove trafficinfo example and related docJing Bai2012-12-0716-1257/+1
| | | | | | | | | | Due to trafikanten API change, this example doesn't work anymore. The new API uses JSON based content, we can probably use it for qjson example. Task-number: QTBUG-28423 Change-Id: I36b499b4b2f36d46314937c24d9a2df3bba7b391 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* QtXmlPatterns: Doc: Fix links to designer manualDavid Schulz2012-12-071-1/+1
| | | | | Change-Id: Ifbcf2769c8212eb289759d64b9637106792a948d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* centralize and fixup example sources install targetsv5.0.0-rc1Joerg Bornemann2012-12-058-41/+14
| | | | | | | | | This follows suit with aeb036e in qtbase. Change-Id: I3b93a30194cddd7514f05ce915eecb2e1ed6433c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* sync.profile: Point dependencies to 'refs/heads/stable'Sergio 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: Ie117ec0e488c740c0be01359912520d54c24248f Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* fixing linking against non-installed libsOswald Buddenhagen2012-12-041-0/+1
| | | | | | Task-number: QTBUG-27427 Change-Id: I947d67b242e5a882f08a0672eaad076f818bf29d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Edited qdocconf file to produce correct QCH titles.Jerome Pasion2012-12-031-2/+3
| | | | | | Task-number: QTBUG-28341 Change-Id: I35301f8e29ee8502d4cd77b2ebf0f043eb59ab91 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Doc: Grouped the XML pattern examples under xmlpattern_examples groupVenugopal Shivashankar2012-11-305-1/+5
| | | | | Change-Id: Id026f8fe89d5a6e59de5bca14b5d0b5eb2a41752 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Change copyright information from Nokia to DigiaSergio Ahumada2012-11-281-2/+2
| | | | | Change-Id: Ic2e32ec9bf39448b6dc51da856359a1cfc6e00c8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Always get the default flags from QAIM.Stephen Kelly2012-11-271-1/+1
| | | | | Change-Id: I89abe8fdbd836804624a669296ae673230149472 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Display first result as wellChristian Stenger2012-11-261-0/+2
| | | | | Change-Id: If014d72cee6e3dd9e822a36390f56754c30e3848 Reviewed-by: hjk <qthjk@ovi.com>
* Doc: Modularized Qt XML Patterns documentation.Jerome Pasion2012-11-2393-244/+307
| | | | | | | | | | | | | -moved snippets, images, documentation to src/xmlpatterns -fixed \snippet tag -ported module information from qtdoc repository -enabled "make docs" for the module -set up qdocconf file and .index file -updated tests/auto/patternistexamples to point to the new snippet locations Change-Id: Ifd10733c277c6dbacac42898c8e7bacd00d23f27 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Stylefixes for examples in qtxmlpatternsChristian Stenger2012-11-225-49/+49
| | | | | Change-Id: I5a7a22779f13805479b37970888a26250c56a70d Reviewed-by: hjk <qthjk@ovi.com>
* Fix building of installed examples.Friedemann Kleint2012-11-212-1/+7
| | | | | | | | | - Install xmlpatterns.pro and its shared folder - Add missing resources. Task-number: QTBUG-27977 Change-Id: Ib7db1d23595cd52bd32d68a9962a7d49dfe7f02d Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-201-1/+0
|\ | | | | | | Change-Id: If338bfeddf4cbd1c2ea8d4335399db21f44fbf4c
| * Doc: Removed the HTML template from the .qdocconf filesJerome Pasion2012-10-291-1/+0
| | | | | | | | | | | | | | -qt-module-defaults.qdocconf already contains the HTML template. Change-Id: I044a25f4fe6a42514b6595c2b26b799192f66e7b Reviewed-by: Martin Smith <martin.smith@digia.com>
* | CMake: Remove obsolete test_modules testv5.0.0-beta2Stephen Kelly2012-11-013-74/+0
| | | | | | | | | | | | | | The generated module_includes test is a super-set of this test. Change-Id: Ibd292df016adede59d0fb5d02c0ec387c8039a9b Reviewed-by: Rohan McGovern [inactive] <rohan.mcgovern@nokia.com>
* | CMake: Test module includesStephen Kelly2012-10-311-0/+6
| | | | | | | | | | Change-Id: I87c2686c2ac2c5f7fb93395175c780701551b9d7 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | Tests: Use qInstallMessageHandler()Kai Koehne2012-10-162-7/+7
| | | | | | | | | | | | | | qInstallMsgHandler got deprecated in Qt 5. Change-Id: I4f2b7cad5f2b6a1d1c617e41a62ee0cbf11bcd47 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Fix XmlListModel memory leakAri Koivisto2012-10-149-9/+17
|/ | | | | | | | | | | | This is a forward port of a memory leak fix committed to Qt 4.8 (QTBUG-15191). The fix includes all changes except changes to qitem_p.h which has changed in Qt 5.0. Additionally fix qxmlquery autotest failure introduced in the original Qt 4.8 patch. Task-number: QTBUG-27357 Change-Id: Ia0e916d9d6bccea014d28920cef48d6e47e8f04f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update docs after modularization of docsTor Arne Vestbø2012-10-115-754/+5
| | | | | | | | The global files now live in qtbase only, and are made available to the other modules via the $QT_INSTALL_DOCS variable. Change-Id: I0f4408c5ac71f33833101fd88fbc84ed2ee092fd Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Don't have spaces in the project name. It's inconsistent.Jan Arve Saether2012-10-111-1/+1
| | | | | | | | This is just for consistency, otherwise we would have to tell it to look for the qtxmlpatterns/qt-xml-patterns.index file. Change-Id: Id374511e09bba038209fe48616313b16e0a6e4b3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Build fix after QVariant change.Jędrzej Nowacki2012-10-103-10/+10
| | | | | | | | QVariant(Qt::GlobalColor) was removed in Qt5. Change-Id: I08b89fc6799e3645755dd435cc8b861fafd9fd05 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove invalid URIs from testing with QXmlQueryThiago Macieira2012-10-081-4/+1
| | | | | | | | | | | QXmlQuery requires proper URIs/URLs and these two aren't valid. A scheme is never empty and a path cannot contain a colon before the first slash. QUrl has been pointing out that new error condition since 7d62f8ace542e04e3ddf92eec4fdad8d34ac9585 Change-Id: Ic206908345f45b1cce0a3733584a65b02b8c2791 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* HTML template: Updated copyright notice from Nokia to Digia PlcJerome Pasion2012-09-262-28/+3
| | | | | Change-Id: I37e2b67f1f3a0d26c7b2d5a873a1c1acd0e71a55 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-24907-21102/+21102
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I34508f293d75832657f79479e2a8c184e873e154 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
View Lorry Controller Status