summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Fix some typosv5.3.0-beta1Sergio Ahumada2014-03-034-4/+4
| | | | | Change-Id: Ic387dac14f664fd01700142ca303d01d2fe09168 Reviewed-by: Mitch Curtis <mitch.curtis@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
| * Doc: Updated url variable in qdocconf files.v5.2.0-rc1v5.2.0Jerome Pasion2013-11-061-0/+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: I7f989870b311e101ed4de85f3139f010012cfd71 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * QAbstractXmlNodeModel: avoid undefined behaviorMarc Mutz2013-11-051-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 409655f3451815930b70a71baa175ab9f34467ed, the C-style cast was replaced by pointer arithmetic: char *null = 0; return null + offset; Says the standard (5.7 [expr.add]/5): When an expression that has integral type is added to or subtracted from a pointer, [...] If both the pointer operand and the result point to elements of the same array object, or one past the last element of the array object, the evaluation shall not produce an overflow; otherwise, the behavior is undefined. Iow: the above code has undefined behaviour. Fix by going back to the casting version, but using a C++ reinterpret_cast instead of a C-style one. Task-number: QTBUG-32735 Change-Id: Ia774491b13b1c52089daf63a7921b163fc93abce Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Revert "Handle new QtTraceMsg type, fix warnings about unhandled enumeration ↵Kai Koehne2013-11-052-3/+3
| | | | | | | | | | | | | | | | | | | | value." This reverts commit bf49d9f0d41c3be802dbdd2c23dfe7c5fd86f4b0. QtTraceMsg was removed from QtCore for the moment, too. Change-Id: I1d6aaacf5e363f81272da4fbb0a4ff12337dd677 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-241-0/+3
|\ \ | |/ | | | | Change-Id: I5040e8925ebcf73b353abd3b3e91f9603a086c49
| * Fix compilation with mingw.org headersKai Koehne2013-10-231-0/+3
| | | | | | | | | | | | | | | | | | -std=c++11 sets __STRICT_ANSI__, and the stdio.h from mingw.org doesn't declare e.g. _fileno then. Change-Id: Iaa29e4f2b04bcae73b8706aff1be83913bcf6a52 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-111-1/+1
|\ \ | |/ | | | | Change-Id: Icd0bc0b31f6c925850d6773ec1000afc9a702d36
| * Android: Skip tools built for target architecturev5.2.0-beta1Eskil Abrahamsen Blomfeldt2013-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | Android apps require packaging to be usable, so they need to be built individually, not as part of the subdirs build. The build would fail during make install due to this. Task-number: QTBUG-34023 Change-Id: If7627dcdc15334f82c454c6a2a19501fcc6bc970 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-10-085-1/+34
|\ \ | |/ | | | | Change-Id: Icbade3b8a1098b442dccb04c85c597e9c7adc423
| * Fix undefined behavior validating XSD substitution groupsMark Shroyer2013-10-025-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bug in XSD substitution group validation would result in an invalid cast of SchemaType::Ptr to XsdComplexType::Ptr, in which case evaluating complexType->prohibitedSubstitutions() exhibited undefined behavior. In practice this caused validation against XSD schemas containing substitution groups to fail on some machines, where ORing the checkSet mask against out of bounds memory could cause the function XsdSchemaHelper::substitutionGroupOkTransitive() to return a false negative. Minus the bug fix, the regression test added in this commit failed on (at least) Linux ARM when compiled with the Linaro toolchain 2013.01 g++ 4.7, with flags -marm -mcpu=cortex-a8 -O2. However, it did not fail on a Linux amd64 machine prior to the bug fix. Change-Id: Idd060a941a3bc0620f1fcc903375e43022bdcbdc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-295-7/+13
|\ \ | |/ | | | | Change-Id: I4e5b26b796b12ced8a62926cdf91da10b9c20f9e
| * Remove QtAlgorithms usage from QtXmlPatterns.Friedemann Kleint2013-09-273-4/+10
| | | | | | | | | | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I4e2c7bf7970ba59ca9443c545b66db9f509d946b Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * Handle new QtTraceMsg type, fix warnings about unhandled enumeration value.Friedemann Kleint2013-09-262-3/+3
| | | | | | | | | | Change-Id: Ia908aa03e0f6a0e4f92013ae84fc68ac73919d08 Reviewed-by: hjk <hjk121@nokiamail.com>
* | Bump qtxmlpatterns version to 5.3.0Thiago Macieira2013-09-241-1/+1
| | | | | | | | | | Change-Id: Ie230ae86d664542b1ce98a50c967460373ebafda Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-244-8/+10
|\ \ | |/ | | | | Change-Id: I580d8758366a6d225391b4bb7a2a3d37c8dca196
| * Fix MSVC2010 warnings.v5.2.0-alpha1Mitch Curtis2013-09-242-7/+3
| | | | | | | | | | Change-Id: Ic586e7d306729f26859411b17c79d36320f487e7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Adapt to QDateTime's new timezone supportThiago Macieira2013-09-231-0/+6
| | | | | | | | | | | | Change-Id: I685b1be45fcf6b59de12204ca471e35a5a03f06d Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: John Layt <jlayt@kde.org>
| * Update QXmlQuery test result after default date format change.Jędrzej Nowacki2013-09-231-1/+1
|/ | | | | | | | | QTime is not showing milliseconds by default anymore, when converted to QString. Change-Id: Iba745919ee1f034aebc75628a96efad5546f03c1 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix Clang warning of constant-false comparisonThiago Macieira2013-09-071-1/+1
| | | | | | | qstringvaluefns.cpp:224:23: error: comparison of constant -1 with expression of type 'QString::NormalizationForm' is always false [-Werror,-Wtautological-constant-out-of-range-compare] Change-Id: Ia0dd98f72521709712f5ed11ecf19a48acaf1998 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-061-3/+3
|\ | | | | | | Change-Id: I29e25aef95a7b845bfe7d57d41369fec2f1fd562
| * 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>
* | Use the new, non-deprecated QDateTime functions for UTC offsetThiago Macieira2013-09-033-6/+6
| | | | | | | | | | Change-Id: Ia7f8c08bba44fbb01d3babeed7a430dcb9660b99 Reviewed-by: John Layt <jlayt@kde.org>
* | QtXmlPatterns: Fix (!a == b) bugTobias Hunger2013-08-292-2/+2
| | | | | | | | | | | | | | | | | | | | The ! applies to a only, so the result of this expression is most likely not what was expected. Clang warned about this one. Change-Id: I600c1ec70fa22313eee70ecce8995afd83713de6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-08-052-2/+25
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8472ccedaa829436aebf4424b64a3b7dd0adc173
| * 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>
View Lorry Controller Status