summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | XSLTTokenizer - remove unreachable function call.Timur Pocheptsov2016-06-011-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coverity CID 22016 - the code can never be reached, since what we have is: loop() { switch { ... if (a) { ... continue; } else { ... continue; } unrechable(); break; } } Change-Id: I13a0ddab0e0f9e4629beb80fd39369b734880795 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | XSLTTokenizer::queueSorting - remove redundant &&Timur Pocheptsov2016-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Coverity CID 88517, we have expression equivalent to 'true && something()', something() should be enough. Change-Id: Id2bfe9b798e43491e6e8147df49262c38a94f98f Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | tst_XmlPatterns::filterStderr - extend the filterTimur Pocheptsov2016-06-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent change in network/ssl (namely QSslDiffieHellmanParameters) resulted in 'Unimplemented code.' warning message from default (non-OpenSSL) version (Q_UNIMPLEMENTED there). This makes the test fail. Since Q_UNIMPLEMENTED is not suppressable by logging category trick, extend the already existing filter instead. Change-Id: I6963731dfa7bb74002f9e44e711a6dfb61578cd7 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-246-45/+5
|\ \ \ | |/ / | | | | | | Change-Id: Ie2fcdbd40c4ee41d74250fed025f0363931aefa9
| * | 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>
* | | Remove Windows CE.Friedemann Kleint2016-04-1516-133/+8
| | | | | | | | | | | | | | | | | | | | | | | | Remove #ifdef sections for Q_OS_WINCE and wince .pro file clauses. Task-number: QTBUG-51673 Change-Id: Id03f665883a501105e76c2842fb7c0fbf3086687 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-088-129/+137
|\ \ \ | |/ / | | | | | | Change-Id: I6b681aee6f87beca37f532daea8380580098c3e9
| * | 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>
* | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / | | | | | | Change-Id: I2ce0bec7bb38aededd663cc6d111f09258ea3c9d
* | 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
| | * 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>
* | | | tst_xmlpatterns: Modified flag QT_NO_PROCESS positionTuomas Heimonen2015-09-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iec0b443027c59cf171eec94968f03dae3ffb136a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | | Bump versionOswald Buddenhagen2015-09-101-1/+1
| | | | | | | | | | | | | | | | Change-Id: Iff259a9959d3b10a9230d640cb94e0ea06f83f87
* | | | Tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0 for simple cases.Friedemann Kleint2015-08-3110-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix usage of API that is marked deprecated. Change-Id: If9622110d9ab2b1796602144ff484cdc3ac1f014 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | | Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.Friedemann Kleint2015-08-3125-25/+0
|/ / / | | | | | | | | | | | | Change-Id: Idf9932358a6442395dfb95655a8d46be7f57f81b Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
View Lorry Controller Status