summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Replace use of C-style cast with something that is not a cast.old/5.1Thiago Macieira2013-08-161-3/+3
| | | | | | | | | Avoids a warning in user code. We should add -Wold-style-cast to our header checks. Task-number: QTBUG-32735 Change-Id: Ic284e3a5df56789d51484364b34a9ebc026bb20a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-261-0/+25
|\ | | | | | | Change-Id: I861d55430174471036b7e7e34202725ae6131490
| * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-231-0/+25
| | | | | | | | | | Change-Id: I056aba05ab8e3e1c8ea9edde1a893bbade3d379a Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | test: Remove QSKIP from tst_xmlpatternsSergio Ahumada2013-07-261-2/+0
| | | | | | | | | | | | | | | | Tests are passing nowaways on OS X. Task-number: QTBUG-22556 Change-Id: I1c2c864c6a9d9c9195012291745750b0193f4d00 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-231-1/+1
|/ | | | | Change-Id: I6b23978f099044c766cf1e022253b78a7dba797b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Replace qt.nokia.com by www.qt-project.org in doc snippets.Friedemann Kleint2013-07-162-4/+4
| | | | | | | | Task-number: QTBUG-32390 Change-Id: I1e08a4cd5bbefbfc5cfd5b36724089cb1d0e78a8 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Replace qt.nokia.com by www.qt-project.org in tests.Friedemann Kleint2013-07-152-18/+18
| | | | | | | Task-number: QTBUG-32390 Change-Id: I8e3d0df9ff929490a288dca0a9da12751af6b851 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix mailing list address.Friedemann Kleint2013-07-111-1/+1
| | | | | Change-Id: I31792fd1ce8dc353403a91935c872334ca7e10cc Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* test: Add 5.0.0/5.1.0 bic data for linux-gcc-ia32Sergio Ahumada2013-07-102-0/+9048
| | | | | | | | The 5.0.0 data was missing from before, so taking the opportunity to add it now. Change-Id: I8d269fa735cfea9e50eeaf70c49c56aeb173b357 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove use of 'register' from QtXmlPatterns.Stephen Kelly2013-06-161-5/+5
| | | | | Change-Id: I7d5136b9381fcce1ac7233ac743ab205d73ca0fa Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix warnings found by clang: private members unused in classesThiago Macieira2013-06-112-10/+7
| | | | | | | | | | | | These are private classes, so there's no need to keep binary compatibility or reserved members. qabstractxmlpullprovider_p.h:103:41: error: private field 'd' is not used [-Werror,-Wunused-private-field] projectedexpression_p.h:124:55: error: private field 'm_axis' is not used [-Werror,-Wunused-private-field] qprojectedexpression_p.h:154:41: error: private field 'm_right' is not used [-Werror,-Wunused-private-field] Change-Id: Idd46da87aaa85124b285cdcf01cf76eaa16e86c3 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-291-1/+1
| | | | | Change-Id: I6a3c725d0c0a102a3f1254f203dde46e3512a9c5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* sync.profile: Point dependencies to an empty stringv5.1.0-rc2v5.1.0-rc1v5.1.0Sergio Ahumada2013-05-241-1/+2
| | | | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: Ia57b19490beaab0ab551620c5a033aaf0189a5b0 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Doc: Removed module page from "technology-apis" group.Jerome Pasion2013-05-241-1/+0
| | | | | | | The overviews in the main index.html replaced the technology-apis group. Change-Id: I827abd6488b07c75a23925137fce75d37de05319 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Add changes-5.1.0 fileSergio Ahumada2013-05-131-0/+22
| | | | | Change-Id: I0d3ebb797ee1c185162a6defa4a58e2ffbfca41b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix warnings about signal-slot connection in filetree example.Friedemann Kleint2013-05-132-3/+3
| | | | | | | Task-number: QTBUG-31079 Change-Id: I2696834f70bd0db05c9d70759b81159fabe561fd Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* remove pointless INCLUDEPATHv5.1.0-beta1Oswald Buddenhagen2013-04-261-1/+0
| | | | | | | QT+=xmlpatterns-private in xmlpatterns.pri already handles that. Change-Id: Id276ff89cc3b315119ce23c654be24a9503e9001 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Fix module name in .qdocconfTopi Reinio2013-04-261-11/+11
| | | | | | | | | Use CamelCase for module name(s) used in in .qdocconf - this is required as qdoc will generate visible output (tags in example manifest files) based on these names. Change-Id: I2ec5426b5f2a3ea6cc40608ef2bc6c9e7b6f8dd2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Remove old QtXmlPatterns.4.* dataSergio Ahumada2013-04-226-17789/+0
| | | | | Change-Id: I96304652faab35bdbb71bf814aab35be7dc68151 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Add missing LICENSE.FDL fileSergio Ahumada2013-04-191-0/+450
| | | | | | | | This seems to be a leftover from c79d19ae9d4feb353236db49381d8c6b9b032a4b Change-Id: Ie40dd9cd9f500fea6b453f2e4d37e699f3c95a70 Reviewed-by: Timo Jyrinki <timo.jyrinki@canonical.com> Reviewed-by: Jason McDonald <macadder1@gmail.com>
* Doc: Remove instructions for using qtdemo from examples READMETopi Reinio2013-04-161-32/+3
| | | | | | | | | | The Qt Examples and Demos Launcher is not maintained anymore. Edit the README to mention Qt Creator as the way to find and launch examples. Task-number: QTBUG-28388 Change-Id: If3662d53a46335a5bdd8ced2df104e545d3fe5ba Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: Fix minor typoSze Howe Koh2013-04-101-1/+1
| | | | | Change-Id: I68323ffd7f58f9dcb41aab96195598eebcc6b7ce Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix exit crash in xmlpatternsvalidator.Friedemann Kleint2013-04-052-2/+32
| | | | | | | Clean up QNetworkAccessManager using qAddPostRoutine(). Change-Id: I6ee8b0bcccf09abf4e4b35e063f48f6d7a631bfe Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* XmlPatterns-Testsuite: Use GLOBAL_STATIC for network access manager.Friedemann Kleint2013-04-052-4/+4
| | | | | | | | Do not use global static variable, this causes warnings and hangs on Windows. Change-Id: Ic31c347b69ae7e97699a351834d34f7eda6695e2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-0/+25
|\ | | | | | | Change-Id: Ie603301c5e1d5e9ecffbf193f56c0c70644d2f69
| * 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>
* | Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| | | | | | | | | | Change-Id: I8ee826ab302eeefa03636d9c66f08d9cc9be2cf5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge branch 'dev' into stableSergio Ahumada2013-03-19399-1528/+5
|\ \ | | | | | | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I521b815a7f8c7ae439186c842f01efcdee744b0d
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-141-0/+2
| |\ \ | |/ / |/| | | | | Change-Id: I604f0c03daf774d5c7cb96750c9afb230e6290cd
* | | 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
| | | * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-062-2/+2
| | | |\ | |_|_|/ |/| | | | | | | Change-Id: I0bb29c2a3f076341bc99aaf2b4fa0f09ddd720c7
* | | | 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>
| | * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-186-30/+1215
| | |\ | |_|/ |/| | | | | Change-Id: Iafbd5b538ebe0254d5fcea0fad0e58f8b66c1084
* | | 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 remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-05901-942/+914
| | |\ | |_|/ |/| | | | | Change-Id: I0e2f2023d576e479246ed86c6a95eba3c8b9d93b
* | | 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>
| | * Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-28398-1528/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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: I74e76ed86361fbbf8957bf7a0540f2bd3350eb0a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| | * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-0431-1371/+80
| | |\ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Conflicts: src/xmlpatterns/api/qcoloroutput_p.h src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h sync.profile Change-Id: Ibf1d2ab42c4316d9fada397b1f1c0f37e65662dd
View Lorry Controller Status