summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* XSLTTokenizer::queueSorting - remove redundant &&5.6Timur Pocheptsov2017-12-131-1/+1
| | | | | | | | | | | Coverity CID 88517, we have expression equivalent to 'true && something()', something() should be enough. Task-number: QTBUG-65144 Change-Id: Id2bfe9b798e43491e6e8147df49262c38a94f98f Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit a5ef9038f13f881796f9779c7e0ffef740bfdb58) Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Bump versionOswald Buddenhagen2017-09-211-1/+1
| | | | Change-Id: Ifc5c6e42d518db88ffd4eb26c563193b2eb74b49
* Add change file for Qt 5.6.3v5.6.35.6.3Antti Kokko2017-09-011-0/+24
| | | | | | | Task-number: QTBUG-62723 Change-Id: I34d12daba918b9ebfe6f3404219b75b72f8f6f85 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 7b67fba8bb21b06d423b68911b227fd1db22b1be)
* QXmlName: Add copy constructor and use default for copy/assignmentFriedemann Kleint2017-04-202-1/+2
| | | | | | | | | | | | | | | Fix Clang warning: 95:15: warning: definition of implicit copy constructor for 'QXmlName' is deprecated because it has a user-declared copy assignment operator qmetatype.h:1684:83: note: in instantiation of member function 'QtMetaTypePrivate::QMetaTypeFunctionHelper<QXmlName, true>::Construct' requested here qmetatype.h:1712:12: note: in instantiation of function template specialization 'qRegisterNormalizedMetaType<QXmlName>' requested here 134:1: note: in instantiation of function template specialization 'qRegisterMetaType<QXmlName>' requested here qmetatype.h:1848:34: note: expanded from macro 'Q_DECLARE_METATYPE' qmetatype.h:1860:35: note: expanded from macro 'Q_DECLARE_METATYPE_IMPL' qmetatype.h:765:32: note: implicit copy constructor for 'QXmlName' first required here Change-Id: I5e194201278d2a5d613eac9dc9cd7b36679697b3 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> (cherry picked from commit da19c9882295a8f3216284935c05ad4b89c445bd)
* Bump versionOswald Buddenhagen2016-11-281-1/+1
| | | | Change-Id: Ic3a254c7fd2c8242ada40d35c9bffef7038ac3f8
* remove dependencies from sync.profileOswald Buddenhagen2016-11-061-10/+0
| | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: If13877a687aba659675274e8a06be2ca9c9a50c9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Fix memory leakAlbert Astals Cid2016-11-026-15/+15
| | | | | | | | | | | We can't have the ExpressionVariableReference/TemplateParameterReference holding a Ptr of VariableDeclaration because the VariableDeclaration holds a Ptr of them (in the references member) so they were referencing eachother and the reference count never reaches 0. Task-number: QTBUG-32745 Change-Id: I4cda6d9eccad123984f4ad35db3e56da01d4d5b1 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-0811-8/+723
|\ \ | |/ | | | | Change-Id: I9a379d34bf80344de9b6e9465e6f35fca7fd1a12
| * Add baseline file for literalsequence.xq autotest.Jan Arve Saether2015-10-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | d17eba9d34f412e592c3b049c6c14fd9ccada87b added literalsequence.xq, but forgot to add the baseline file. This probably passed in 5.5 because the test was run twice (because of flakyness): 1. The first pass it would fail (but generate the baseline). 2. The second pass it would succeed because the baseline was already there Change-Id: If40ee6c57e97cb4cffc959e0f6bb768e610a76d4 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * Update new Baseline.xmlJan Arve Saether2015-10-071-1/+1
| | | | | | | | | | | | | | | | | | Appararently, some new tests fail and other new tests started pass. I haven't digged into the reasons why, but the fact that the pass percentage is at 96%, this is better than not testing it at all. Change-Id: Id5e2710ebd3c17b65a2792245a073c676d116208 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * Compile fix for platforms without QProcess supportv5.5.15.5.1Pasi Petäjäjärvi2015-09-111-4/+4
| | | | | | | | | | Change-Id: Ied9eefcaff7c7a991cde483dc08c6905ba9ca421 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-08-190-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If7c5b9674646fcd1cf8f2a6c43e4e1e0f126950f
| | * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | | | | | | | | | | Change-Id: I6e7fa03e23796db90db44a944544002e851cffd9
| * | Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
| | | | | | | | | | | | | | | | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * | Iterate Over the Items (Not the Operands) of a Literal SequenceDavid E. Narvaez2015-07-297-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current code iterates over the (empty) list of operands of a Literal Sequence, ignoring any items in it, so Literal Sequences are always ignored in the ExpressionSequence. Task-number: QTBUG-35897 Change-Id: I60341ac21c8e3b77bf6d8dfeebdbafe010844406 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* | | Doc: Fix linking issuesTopi Reinio2015-10-052-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QXmlName has overloads for its functions, marked \internal, and QDoc fails to link to the public ones because it sees the internal ones first. As a workaround, exclude parentheses from the link - QDoc then uses a different code path which resolves the functions correctly. Change-Id: I0470cfd67c5d089ca586fd2debcb7b71c606a716 Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
* | | Doc: Replaced \target with \keyword right after \startpageNico Vertriest2015-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A \target whose purpose is to link to the top of a page (and not to a section within a page) works better as a \keyword, because \target generates a new html anchor which, in this case, is not tied to any title element on the page. A \keyword links to the page itself, as expected. Task-number: QTBUG-48482 Change-Id: I0d55924f66c26f3fb23a07be1f1d57f2105c879d Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | OrderBy: Replace deprecated qLess by std::less.Friedemann Kleint2015-09-071-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warning: expr\qorderby.cpp:79:7: warning: 'template<class T> class qLess' is deprecated [-Wdeprecated-declarations] class qLess<Item::List> ^ In file included from qtbase\include\QtCore/qalgorithms.h:1:0, from qtbase\include\QtCore/QtAlgorithms:1, from expr\qorderby.cpp:34: qtbase/src/corelib/tools/qalgorithms.h:150:40: note: declared here class QT_DEPRECATED_X("Use std::less") qLess ^ expr\qorderby.cpp: In member function 'virtual QAbstractXmlForwardIterator<QPatternist::Item>::Ptr QPatternist::OrderBy::evaluateSequence(const Ptr&) const': expr\qorderby.cpp:172:11: warning: 'template<class T> class qLess' is deprecated [-Wdeprecated-declarations] const qLess<Item::List> sorter(m_orderSpecs, context); ^ In file included from qtbase\include\QtCore/qalgorithms.h:1:0, from qtbase\include\QtCore/QtAlgorithms:1, from expr\qorderby.cpp:34: Change-Id: Ieb626eb0de96aea670433bb46a52ed780240e8d7 Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
* | | xmlpatterns test: Improve process handling.Friedemann Kleint2015-09-031-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | Introduce a message when starting fails or timeouts occur and flip the order to check for timeouts first and then check the exit code. Change-Id: I293aa55888186f66c12cd86bcb8010802f521032 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | properly add testsuites submodulev5.6.0-alpha1Oswald Buddenhagen2015-08-133-3/+3
| | | | | | | | | | | | | | | Change-Id: Iea043221b965bbbc05f9c98b8f58aa7870acadfe Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | | Add qtxmlpatterns-testsuites as submodule and get XQTS from thereFrederik Gladhorn2015-08-072-2/+4
| | | | | | | | | | | | | | | Change-Id: I9dda1a76e730dfe1790fe6771a6f9ccd63c5d13b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | | Remove the use of the "register" keywordThiago Macieira2015-08-061-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | It's deprecated in C++14. Found by Clang: error: 'register' storage class specifier is deprecated [-Werror,-Wdeprecated-register] Change-Id: Ib306f8f647014b399b87ffff13f23d75e8255950 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
View Lorry Controller Status