summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.15.7.1Liang Qi2016-09-171-0/+4998
|\ | | | | | | Change-Id: If65b4b8c4b328f64ca21ffb289bb9c4b7cb48a9c
| * BC data files for QtXmlPatterns for Qt 5.6Milla Pohjanheimo2016-09-051-0/+4998
| | | | | | | | | | | | | | | | Added binary compatibility data files for tst_bic test Change-Id: I4cda6d9eccad1dec74f4ad35db3e56da01d4d5b1 Reviewed-by: Sergio Ahumada <sahumada@texla.cl> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | BC data files for QtXmlPatterns (5.7)Milla Pohjanheimo2016-09-051-0/+5280
| | | | | | | | | | | | | | | | | | Added the generated data files for the binary compatibility tests for QtXmlPatterns for Qt 5.7. Change-Id: Ia64f5d943c91313182cb0cc6f743440b6bd53602 Reviewed-by: Sergio Ahumada <sahumada@texla.cl> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-051-1/+1
|\ \ | |/ | | | | Change-Id: Id00802d52ac29efcabb422f0e48f20dcf9044d38
| * xmlpatterns: don't use fromLocalFile() on relative pathsv5.6.25.6.2David Faure2016-07-311-1/+1
| | | | | | | | | | | | | | | | Creating a URL like "file:fileToOpen=globals.gccxml" makes no sense, and breaks QUrl::resolved since qtbase commit 8a33077. Change-Id: Icab4fac92db2e7c3d922f548462c3345b8addd83 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-0125-24/+70
|\ \ | |/ | | | | Change-Id: I0653ca8dd6a9b6ee2314911c7679a1c056dc3709
| * QXmlQuery: fix smart pointer typeMarc Mutz2016-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | m_resourceLoader is a QExplicitlySharedPointer<DeviceResourceLoader>, and ResourceDelegator inherits DeviceResourceLoader, but the newly-allocated object was constructed into a QExplicitlySharedPointer<ResourceLoader>. Benign, but wrong. Found while trying to compile the module without QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST. Change-Id: I6f0e7bd50488ae6db6ab6c7022503332cd8523f1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Fix type of QCommonValues::YearMonthDurationZeroMarc Mutz2016-07-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported by UBSan: src/corelib/tools/qshareddata.h:167:13: runtime error: downcast of address 0x0000023ce510 which does not point to an object of type 'DayTimeDuration' 0x0000023ce510: note: object is of type 'QPatternist::YearMonthDuration' 00 00 00 00 90 6c 52 5b 1f 2b 00 00 01 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 31 00 00 00 ^~~~~~~~~~~~~~~~~~~~~~~ vptr for 'QPatternist::YearMonthDuration' Another victim of QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST... Change-Id: I121433e0d2ad8b203ccf9d9f08bd166b39502cbb Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Correct return type of QXmlQueryPrivate::staticContext()Marc Mutz2016-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported by UBSan: qtbase/src/corelib/tools/qshareddata.h:167:13: runtime error: downcast of address 0x2ac9a801a410 which does not point to an object of type 'GenericStaticContext' 0x2ac9a801a410: note: object is of type 'QPatternist::StaticFocusContext' 00 00 00 00 28 95 b7 9d c9 2a 00 00 01 00 00 00 c9 2a 00 00 f0 a1 01 a8 c9 2a 00 00 70 fa 0b 02 ^~~~~~~~~~~~~~~~~~~~~~~ vptr for 'QPatternist::StaticFocusContext' I had no idea how the QExplicitlySharedDataPointer conversion could ever compile, until I saw that this module defines QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST which is, of course, utterly broken. Change-Id: Ie392ba74438b6c75fde9fabe09f9b0e655489cd9 Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Item: replace a Q_ASSERT with a Q_STATIC_ASSERTMarc Mutz2016-07-191-1/+1
| | | | | | | | | | | | Change-Id: I32927731c73b5335f2589c0754ffef2cf0d5ed3f Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Add some missing initializationMarc Mutz2016-07-193-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported by UBSan: xmlpatterns/expr/qorderby_p.h:78:15: runtime error: load of value 11181584, which is not a valid value for type 'Direction' xmlpatterns/expr/qorderby_p.h:78:15: runtime error: load of value 32766, which is not a valid value for type 'OrderingEmptySequence' xmlpatterns/schema/qxsdstatemachine_p.h:66:11: runtime error: load of value 2979516404, which is not a valid value for type 'NodeName' xmlpatterns/schema/qxsdschemaparser.cpp:340:67: runtime error: load of value 40, which is not a valid value for type 'bool' The init values are chosen to match what zero-initialization would have chosen. Change-Id: Iaf69720476cfe6c117dc2c91f39801a0be8bde54 Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Unbreak ubsan developer-buildMarc Mutz2016-07-1218-15/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC's undefined-behavior sanitizer checks that the declared type of the object is a base class of the dynamic type of the object on each access to a member of a class type. It therefore requires the typeinfo for these types, which for polymorphic types is emitted in the TU where the vtable is emitted, too. QtPatternist::AtomicValue is a polymorphic non- exported class, so this failed at link-time. Ditto for the other cases. Fix by autotest-exporting the classes. Also, where applicable, de-inline the dtors, so the vtable (and typeinfo) are pinned to one TU. Change-Id: I5c47be779a3833433a7108a79a57d61a93ab5494 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix -Werror=duplicated-condFrederik Gladhorn2016-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This bit of error handling is actually not checking what was originally intended - doing manual pluralization of the error message. Fix it to at least compile with -Werror (gcc 6.1.1). parser/qmaintainingreader_tpl_p.h:204:26: error: duplicated ‘if’ condition [-Werror=duplicated-cond] Change-Id: Ia81ad3c8c1393d08da0a229c4625504faf56c184 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | Change-Id: I22e272219f6ee9ca874c981f60a8ef3c1972e8bb
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-306-7/+4
|\ \ | |/ | | | | Change-Id: I0b372947924113abfb00d77a655d71c43324ef99
| * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-173-3/+3
| | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: Ibe92a94aa0812c01c99b16391605c30068225a83 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Example MessageHandler: remove unused m_messageType.Edward Welbourne2016-05-311-2/+0
| | | | | | | | | | | | | | | | | | Coverity (CID 22275) pointed out it wasn't initialized in the constructor. It isn't even accessed; and the method that sets it claims the parameter it sets it to is unused. So just remove it. Change-Id: Id48f45a89b7a2d3d44e92b785d425592f1bc6467 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * XsdElement: Initialize member m_isNillableEdward Welbourne2016-05-311-1/+1
| | | | | | | | | | | | | | As pointed out by Coverity (CID 22378). Change-Id: Ibeb06c49b8ead1925bc0377bcaef6109f7f8e53c Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| | | | | | | | | | | | | | it's done centrally now. Change-Id: Ie60ba6b42399c100745e8f5856749311bb30dde2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-2/+18
|\ \ | | | | | | | | | Change-Id: I0c1e5104f8300e9edf6a6b6cbab0e4ee6af4e315
| * | Mention license change in 5.7.0 changelog.v5.7.05.7.0Kai Koehne2016-06-091-2/+18
|/ / | | | | | | | | | | | | Change-Id: If926a689cf167c12ea2fdc9a8ee2f4d9f4c16d49 Task-number: QTBUG-53913 Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Add QtXmlPatterns Qt5.7.0 changelogv5.7.0-rc1Antti Kokko2016-05-241-0/+21
| | | | | | | | | | Change-Id: I97a0e33e1f42ffe8662ba961dc1b1366dd831782 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-195-45/+1
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I477b9d55e20afa1040c026c682e2647ecf50ea86
| * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | Change-Id: Ieb8d21fdcae2b87cd5669ab5a1441bcf1bc4d946
| * Doc: Remove repository name from examplesinstallpathv5.6.1-1v5.6.15.6.1Topi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Ie5faec6f18ffb65affa1b277bb3f6b3f5c66fb44 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * delete .desktop files of examplesOswald Buddenhagen2016-05-104-44/+0
| | | | | | | | | | | | | | | | | | they were added without an explanation, and they can't be particularly useful (because they contain hard-coded paths and refer to non-existing icons). Change-Id: I24cb431268c2d5130bf70a5e2777d321eda36e97 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | tst_XmlPattern:xquerySupport - silence QSsl's debug outputTimur Pocheptsov2016-05-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | None of tests expects our own debug output in the processe's output, thus if we have something (even a minor warning) - the test can fail. It was first found on OS X 10.11 with Secure Transport backend, now pops up with OpenSSL back-end also (Windows 7) Change-Id: I19108416048bf89feae2648106b4a4ba8604aa93 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | tst_XmlPatterns::xquerySupport - silence logging categoryTimur Pocheptsov2016-04-141-0/+6
| | | | | | | | | | | | | | | | | | | | On 10.11 SSL code started producing error messages recently (under investigation) making a test, that expects no error messages to fail. It's a quick and dirty fix. Change-Id: I2339aad551633b378727329d326e610e669b3b2f Reviewed-by: Akseli Salovaara <akseli.salovaara@theqtcompany.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-081-120/+120
|\ \ | |/ | | | | Change-Id: I73a017a419830e8b594a946f969feb6ea225aeb9
| * Add some QChar::unicode() calls to brush over deprecation warning.Friedemann Kleint2016-04-061-120/+120
| | | | | | | | | | | | | | ... introduced with e0ea0f6178 in QtBase. Change-Id: I164d2696668ab2823a89b866804cd52c64dbb90d Reviewed-by: hjk <hjk@theqtcompany.com>
* | xmlpatternssdk: Fix compilation with MSVC 2015.Friedemann Kleint2016-03-103-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change exported class ExpressionInfo to not inherit QPair<>, use normal member variables for the name/details strings instead. Exporting classes inheriting QPair<> is not possible due to a compiler bug in MSVC 2015. src/corelib/tools/qpair.h(83): error C2065: 'TT1': undeclared identifier src/corelib/tools/qpair.h(83): note: This diagnostic occurred in the compiler generated function 'QPair<QString,QString> &QPair<QString,QString>::operator =(QPair<TT1,TT2> &&) noexcept(<expr>)' src/corelib/tools/qpair.h(83): error C2923: 'std::is_nothrow_assignable': 'TT1' is not a valid template type argument for parameter '_From' Task-number: QTBUG-49658 Change-Id: Ib2c27a4c2b0aae28b4de6086c8ddc0220e205075 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-074-5/+5
|\ \ | |/ | | | | Change-Id: Idb463224cc65c6337e0bc484f443470a88a48aa1
| * Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-023-3/+3
| | | | | | | | | | | | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Task-number: QTBUG-45291 Change-Id: Ia5d1ab50f82abad6e51bcd5883e22595eaaedc33 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-2/+2
| | | | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. this fixes no extant problems in this module. Change-Id: I04f5fbd023b6c15de647c513386ddb05bb166142 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-153-24/+12
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1c0ac322f30448a64b55b1ef60f60326ca0171a6
| * Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | | | | | Change-Id: I4f9880fa8f325069ac55973cf591c6ed40edbabc
| * Doc: removed links to QObject XML Model Examplev5.6.0-rc1v5.6.05.6.0Nico Vertriest2016-01-282-10/+8
| | | | | | | | | | | | | | | | | | Uses Qt Webkit which is not part of 5.6 Task-number: QTBUG-43810 Change-Id: I89d74eb9555f04f90f930fa52a834997b5f1e99d Reviewed-by: Martin Smith <martin.smith@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Fix QAbstractMessageHandler's docs regarding thread safetySergio Martins2016-01-151-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The QMutexLocker's usage was bogus, it didn't do any locking because it was being created as an anonymous temporary. It's too late in the game to fix the locking. The user's virtual function might have it's own locking to workaround this bug and might re-enter Qtxmlpatterns API causing a dead-lock. So instead, make the docs consistent with the current behavior. Change-Id: I4d2bdb1431b44262583abf48f795067ed37281d5 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Updated license headersAntti Kokko2016-01-21135-2278/+2312
| | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I1ddbce303f8c450d5bf1b553ab53843a83046bb5 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-21729-10221/+15779
| | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I34265811e603ad9c5a7adcaab7791a521ae0ffb8 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-106-52/+84
|\ \ | |/ | | | | Change-Id: Iaf57c1b0beffdceb3f0533aa77ba536ec4c373a9
| * Change uses of toAscii to toLatin1v5.6.0-beta1Liang Qi2015-12-101-1/+1
| | | | | | | | | | | | | | This ammends e19bbdf8. Change-Id: Idebb29cdbb6fb30ac446701ebc415a7944f48421 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
| * Test suite: Streamline code in QPatternistSDK::DebugExpressionFactory.Friedemann Kleint2015-11-051-50/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix release mode compiler warnings: In member function 'virtual void QPatternistSDK::DebugExpressionFactory::processTemplateRule(const Ptr&, const Ptr&, const QXmlName&, QPatternist::ExpressionFactory::TemplateCompilationStage)': warning: 'title' may be used uninitialized in this function [-Wmaybe-uninitialized] In member function 'virtual void QPatternistSDK::DebugExpressionFactory::processNamedTemplate(const QXmlName&, const Ptr&, QPatternist::ExpressionFactory::TemplateCompilationStage)': warning: 'title' may be used uninitialized in this function [-Wmaybe-uninitialized] by rewriting the code to directly add to a QString. Change-Id: I23781b624e6b3fbc385d8b041a1923d49c291f51 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-284-1/+51
| |\ | | | | | | | | | Change-Id: I41beab20e4de378725e3e2efd929ddd83460d9d8
| | * Can now specify which tests to skip with an environment variable5.5Jan Arve Saether2015-10-264-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e.g. export XMLPATTERNSXQTS_TESTRANGE=42,49 will execute the tests from number 42 to number 49. The tests are numbered sequentially. This will allow us to not having to run through all the tests when testing for a specific testcase. Change-Id: I4c21158a4eada1b48eb809a887216a7160d73220 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| | * Skip tests that crashes.Jan Arve Saether2015-10-231-1/+28
| | | | | | | | | | | | | | | | | | Change-Id: I45ad981fa4d6d7302cf2e06429ea1134957034f3 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * | Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: Ib00fdd4029f62f9e75eddf5cf58eec8cd1c405bb Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | | Use simpler version of qdtoa()Ulf Hermann2015-10-214-23/+5
| | | | | | | | | | | | | | | | | | | | | | | | This allows us to remove the original qdtoa() as qtxmlpatterns is the last client outside qtbase. Change-Id: Ic447898818c7cd1b117f0df87cc83f7b60a5d9c7 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-1415-17/+754
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: tests/auto/xmlpatterns/tst_xmlpatterns.cpp Change-Id: Ib93b62f45d796dd3ed2d5d03f602699295f62705
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-0811-8/+723
| |\ \ | | |/ | | | | | | Change-Id: I9a379d34bf80344de9b6e9465e6f35fca7fd1a12
View Lorry Controller Status