summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Updated the \example command to point to the right directoryv5.4.0-rc1v5.4.05.4.0Venu2014-11-051-1/+1
| | | | | | | | qdoc needs a directory with a project file to generate the source files list at the bottom of the example page. Change-Id: I06b459cce495435d68ed5555ff4f48c860b63e64 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: Applied title case to section1 titlesv5.4.0-beta1Nico Vertriest2014-10-092-4/+4
| | | | | | Task-number: QTBUG-41250 Change-Id: I3155acb9a6813b0309de7fa0542f29c5a3a46b17 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Polish schema example.Friedemann Kleint2014-10-081-4/+22
| | | | | | | | | | | | | Add some error handling, fix warning on startup: QIODevice::read: device not open caused by MainWindow::schemaSelected(0) which clears the instance combo causing the current index to temporarily change to -1. Change-Id: I213d68b07b2dee4e2bbc1404aaf149ce7c189713 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Don't spin a nested event loop for loading schemas synchronously over HTTP.Pierre Rossi2014-09-222-42/+12
| | | | | | | | | | Instead, use the internal synchronous load API in QNAM that relies on a separate thread with a blocking queued connection, just like QtWebKit does for synchronous XHR. FTP doesn't support this attribute, so we have to keep the event loop trick for that one. Change-Id: I785fa6d967160552b31778fcfc120d7ec4194a08 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Frederik Gladhorn2014-09-170-0/+0
|\
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-160-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iaffc08b9bd62e43d866a60785b0a2e6ac3a46010
| | * Bump version5.3Frederik Gladhorn2014-08-291-1/+1
| | | | | | | | | | | | Change-Id: I0b33f04b08aec0d3c1745fb06796747973014100
* | | Remove qtdemo from gitignoreRainer Keller2014-09-171-1/+0
|/ / | | | | | | | | | | | | QtDemo was removed with a commit in qtdoc. Change-Id: Id7c73ade6ba377aafc389bf1f11468d301438af3 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into 5.4v5.4.0-alpha1Frederik Gladhorn2014-08-2814-0/+154
|\ \ | |/ | | | | Change-Id: I3d603fd0df0a445b392a758d1668bfaa9af29b53
| * Add missing private headers warningv5.3.25.3.2Samuel Gaist2014-08-1814-0/+154
| | | | | | | | | | Change-Id: Iaac8c5129451d958d4e8d90ed6bbae80ed6c8755 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Update license headers and add new license filesAntti Kokko2014-08-24853-16835/+9826
| | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: If9208b9c90bcea35bbfe6b9c10db7803e97767e0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | fix for stack overflowKamil Rojewski2014-08-141-14/+18
| | | | | | | | | | | | | | | | | | Recursion in item mapping iterator caused a stack overflow for large datasets. Task-number: QTBUG-40153 Change-Id: I693798de0ecfd3a920a3dd270172ce7ec3c13d8d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Make tests compile with the QExplicitlySharedDataPointer's static_castUlf Hermann2014-07-091-1/+1
| | | | | | | | | | | | | | | | We also need the static_casts there. Change-Id: I5e04109d2465e079909138152324820e931062cd Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Make QtXmlPatterns compile with the QExplicitlySharedDataPointer's static_castGiuseppe D'Angelo2014-07-081-1/+1
| | | | | | | | | | | | | | | | This module requires the static_casts to happen. Change-Id: Iea2f5aa8c6033edffd920a6de73509f3ae19721d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* | Compile fix for platforms without process supportMaurice Kalinowski2014-07-072-1/+21
| | | | | | | | | | Change-Id: Ie150bec62827b592d4b3f2df98a51862d3cc76ae Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | 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: I4f64b5d342409fbe7013c8f5b6c1cef9b3c33673 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-260-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I792cdcb53c271d64f58cd25e6541665daa6efcac
| * Bump versionOswald Buddenhagen2014-06-181-1/+1
| | | | | | | | Change-Id: I3d915197872fbeda076ac4118ce66e856a678acc
* | Add missing copy assignment operator to QXmlSchemaThiago Macieira2014-06-212-0/+12
| | | | | | | | | | | | | | Found by MSVC 2013 when. Change-Id: I09c23afca4c9045523ae0722751fb27737b1b5f8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-05-222-3/+3
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia4376114da086f0e01c5e0833a222d5fb06e33fd
| * Fix copy and paste errorv5.3.1stable5.3.1Frederik Gladhorn2014-05-161-1/+1
| | | | | | | | | | | | | | | | | | Fix error 11 identified by static analysis from http://www.viva64.com/en/b/0251/ Change-Id: I3ed821c6d7cda874bfa5e3a24ccde1a4f2f13ec9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * Fix copy and paste errorFrederik Gladhorn2014-05-141-2/+2
| | | | | | | | | | | | | | | | Fix error 8 and 9 identified by static analysis from http://www.viva64.com/en/b/0251/ Change-Id: I7f6741513814d8707e9dfe3402f970696238b8a3 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-221-1/+1
| | | | | | | | | | Change-Id: Ib01b7b81f4b154910595a5eacd5fa502241097fa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-112-2/+2
|\ \ | |/ | | | | Change-Id: I600107f9b564a5eddac5a1e9a346e3ae3d8bbd6e
| * Fix typov5.3.0-rc1v5.3.0release5.3.0Sergio Ahumada2014-04-012-2/+2
| | | | | | | | | | Change-Id: I4754f1bc1f9fb3e099fc7c7135ca0a933d9b7475 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-244-4/+4
|\ \ | |/ | | | | Change-Id: If9e2f5b518a9078488a7df537d306d495da4672a
| * Fix some typosv5.3.0-beta1Sergio Ahumada2014-03-034-4/+4
| | | | | | | | | | Change-Id: Ic387dac14f664fd01700142ca303d01d2fe09168 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
|/ | | | | | Change-Id: Id44380d8e5fe73ef63a6517637de53cbd6700c8a Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'origin/stable' into devv5.3.0-alpha1Sergio Ahumada2014-02-112-3/+21
|\ | | | | | | Change-Id: I60405f79dbe590e2f598d57f80794364f415c566
| * test: Don't fail *all* tests if the network test server is not set upold/5.2Sergio Ahumada2014-02-112-3/+21
| | | | | | | | | | | | | | | | | | Since not all tests for tst_qxmlquery and tst_xmlpatterns depend on the network test server being set up, now we just fail those which really depend on it allowing the rest to be normally run. Change-Id: I0588cf986ffddea117cee680e07e1a8cc4d68436 Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* | Compile fix for WinRTMaurice Kalinowski2014-01-241-1/+1
| | | | | | | | | | Change-Id: I1c9a9027ac4a592aaf6f34450ab6fbcf3224e47f Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | whitespace fixesOswald Buddenhagen2014-01-2227-80/+80
| | | | | | | | | | | | | | | | remove trailing spaces & expand tabs Change-Id: Ic958087d8c50f3c51d767f5191e54c4079cc74a2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-172-7/+5
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8a745d75ab994164aa861f5d5082e493b02eaea4
| * Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
| | | | | | | | | | Change-Id: Ibf702ab35725578d4f72f4959b1bcca9d8332ce0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Minor optimization, use QStringRef over QStringJędrzej Nowacki2014-01-151-3/+3
| | | | | | | | | | | | | | That way we avoid some unnecessary memory allocations Change-Id: I597443393671d57b1a47b37eb15c3eca54ee4168 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * fix conditionals in DayTimeDuration::stringValue()Joerg Bornemann2014-01-141-4/+2
| | | | | | | | | | | | | | Task-number: QTBUG-35479 Change-Id: If385bd85f5c20871a0248c828626deea2d72e0a2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-102-8/+0
|\ \ | |/ | | | | Change-Id: I220517794f3427f9f1746981e8dc7256bb482285
| * Remove unused variable, found by ICC 14v5.2.1Thiago Macieira2014-01-101-2/+0
| | | | | | | | | | | | | | | | | | qxslttokenizer.cpp(700): warning #177: variable "val" was declared but never referenced const QStringRef val(m_currentAttributes.value(CommonNamespaces::XML, QLatin1String("space"))); ^ Change-Id: Ic806bf1e9c22ead8680907b0e22794d7b07dcc90 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * Remove unused static functions in QtXmlPatternsThiago Macieira2014-01-091-6/+0
| | | | | | | | | | | | | | | | Found by Clang 3.4. Change-Id: I60f78b62d2ecacf58d534623eced537ca62a2405 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-061-0/+1
|\ \ | |/ | | | | Change-Id: I918b255b204a5246fa9cdc9ed3f8c7d71ab01e35
| * Enable -Werror for all of qtxmlpatternsThiago Macieira2013-12-291-0/+1
| | | | | | | | | | Change-Id: Ic385a3589c3c84fdd7e0c73f69ac319d0543009c Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-164-1117/+1564
|\ \ | |/ | | | | Change-Id: I914a08f02d1bca4402a7c29dd4aedb77c99f6d02
| * Filetree-example: Fix sort order.Friedemann Kleint2013-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | The debug version of the algorithm in MSVC performs a check on the less-than function (if a < b, b < a should be false). Always returning QXmlNodeModelIndex::Precedes fails that. Task-number: QTBUG-35525 Change-Id: I2ad030284eb76fd07427ffb710b3d3afd63103e5 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * Fix MSVC2010 warnings.Mitch Curtis2013-12-061-7/+1
| | | | | | | | | | | | Change-Id: I081b4ebad362d99dcae594f877592f2a910002f3 (cherry picked from commit e7a51b138772cb453555d27f44e6a2c0e79e799c) Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * Sync source and generated versions of the query parser.Thiago Macieira2013-12-063-1116/+1569
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The following manual changes to qquerytransformparser.cpp were not reflected in the .ypp source, but they are now: c95a0e6e8eb8ba5fd2a4412b318ad998b3ccb4fc (Nov 2009) c1623a0d42c9869e5a1d04081e7660722a863de5 (Apr 2012) The following change is lost because it modified code generated by bison (not from .ypp) and needs to be re-applied: e7a51b138772cb453555d27f44e6a2c0e79e799c Change-Id: I72e76732acd1c370394c9fc373522b43ace6e009 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-290-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0b0d5044d34bc915614253e89fb6029d6bfb75f7
| * Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
| | | | | | | | | | | | Change-Id: Ieb54e9508f48cc9694bd9a59dc9908cf84a62486 Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-205-14/+38
|\ \ | |/ | | | | Change-Id: I028af77ed75b91c721ec3e20eccca49e30fbd495
| * make it possible to disable XML schema usagePeter Hartmann2013-11-155-14/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing XML schema functionality reduces the size of libQt5XmlPatterns.so considerably: Linux desktop release mode: with XML schema: 4.3 MB without XML schema: 3.2 MB BlackBerry10 release mode: with XML schema: 2.6 MB without XML schema: 1.9 MB XML schema might not be used, especially on a mobile / embedded device, as opposed to the rest of xmlpatterns (e.g. XPath through QML XmlListModel). Task-number: QTBUG-28068 Change-Id: I5024a822179e7241e592f079efe3adef8f661c70 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-084-7/+6
|\ \ | |/ | | | | Change-Id: Ib71b7f22be969dae2e1f4bfc20bc8d5478679e5c
View Lorry Controller Status