summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-2915-4305/+3776
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I56232f2e3996efa9804cfabae61db765629e060a
| * Implement bison parser stack re(al)location.Erik Verbruggen2015-06-108-814/+916
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The elements on the parser stack are of a complex type, which bison generated parsers don't know how to reallocate when they need to grow the stack. This patch implements yyoverflow, which is called whenever the parser runs out of stack space. The size of the elements is quite large (152 bytes on x86_64), so the initial stack (which is allocated on the C stack) is set to 1 element. Any subsequent reallocations are done by using QVector for reallocation, copying the elements, and handling the deallocation. Because of the size of the elements, the stack (vectors) are grown linearly. The upper limit of the stack size if left at 10000 elements, which should really be enough for an lalr(1) grammar. Task-number: QTBUG-4470 Change-Id: Ic1ef08655b388c38ef452d03a425cbd31b91825b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Prefixed all tokens with T_ to prevent collisions with macros.Erik Verbruggen2015-06-1011-4205/+3574
| | | | | | | | | | | | | | | | Identifier names like "IN" and "AS" have a high probability of being defined by certain platforms as macros, esp. with Visual Studio. Change-Id: I1fbc0ae33f94387b83377181b6012683a418459a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-031-1/+4
|\ \ | |/ | | | | Change-Id: I40f55a4eabaf2d0d6bcda0a4b6111b27130f24f3
| * Skip op-numeric-unary-minus-1 testcase because it crashes.Jan Arve Saether2015-04-151-1/+4
| | | | | | | | | | | | | | | | | | It seems to require a larger refactoring in order to solve this, so we skip this for now in order for us to be able to run the remaining tests in CI. Change-Id: I2ae4860a92cdb7fb88ca89c4dd1f047bacbaaf9e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Use QSet::intersects() instead of QSet::intersect()Sergio Martins2015-05-302-2/+2
| | | | | | | | | | | | | | It's much faster Change-Id: I959559a442ab6acf424d7798b9bcd01ab29e65e3 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Make MergeIterator a trivial global static.Sergio Martins2015-05-301-7/+1
| | | | | | | | | | | | | | | | No need to initialize it before main. Change-Id: I2ebc9a2b04a58275570e967c17ace9028f11d5ba Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Use QVector::reserve()Sergio Martins2015-05-281-2/+4
| | | | | | | | | | | | Change-Id: I86391bf0ede4fb32037b4e98889650e36ef5d279 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Replace containsSet() with QSet::contains()Sergio Martins2015-05-261-15/+2
|/ | | | | | | | We have a QSet::contains() since 4.6. Change-Id: Idbafeec6e58aadff4a07e7ed50ac54dc8738623a Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Rename private header qdebug_p.h to qxmldebug_p.h.Friedemann Kleint2015-04-077-6/+6
| | | | | | | | | Avoid conflicts with the newly introduced qdebug_p.h of QtCore. Change-Id: I04b83e159900d9d36fa96ae5112eb4cdf75c0551 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-17746-5379/+5283
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I1dc468d4e08c2dfdc4643410220f18bc8ec450b9 Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-132-3/+2
|\ | | | | | | Change-Id: I3c94e9239cc94cfd3e12a72646314e3687e82d8b
| * Doc: link issue qtxmlpatternsNico Vertriest2015-01-192-3/+2
| | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: Ibc6b27e1935d54e90a8842e788b20dd472472065 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-195-27/+55
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id327fd1d5933b38c3fcc3f7e9edadb34aaf7a059
| * Doc: fix issues to display examples in Qt Creatorv5.4.15.4.1Leena Miettinen2015-01-055-27/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | - Add \brief commands to example docs to show descriptions - Add an examples page with the \group command - Link to the examples page from the module index page - Edit the .qdocconf file - Edit the .gitignore file to allow pushing changes to examples - Add a generic thumbnail image for C++ Code Analyzer example Change-Id: I1a313ae26664ce9fc50ef8962f0facd57dea546b Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Add support for QtInfoMsgKai Koehne2015-01-121-2/+2
| | | | | | | | | | | | | | | | | | Replace the generic default label by the new QtInfoMsg enum, which got added to Qt5Core. Change-Id: Ia56d24f29519d8f9c8f184d74b77292ecbb0bd4b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Add default label to QtMsgType switch statementKai Koehne2014-12-201-0/+1
| | | | | | | | | | | | | | | | | | This enables us to add a new QtInfoMsg message type to qtbase without breaking qtxmlpatterns. Change-Id: Ia4dcee9390eb6b7fc02cf10067317879e931a092 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-0918-46/+170
|\ \ | |/ | | | | Change-Id: I4a853063ea9aaeb5d7055d4652be6faef468236e
| * 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>
| * 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 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>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-08-28716-13638/+7906
|\ \ \ | |/ / | | | | | | Change-Id: I8b1548b720d241259bb531b4742ac92d93788855
| * | Update license headers and add new license filesAntti Kokko2014-08-24716-13624/+7888
| | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | | Remove a wrong ###Lars Knoll2014-08-151-1/+0
|/ / | | | | | | | | | | Task-number: QTBUG-28940 Change-Id: I38c4af131d6056b42d564d20b3a1a5fd839b5b5b Reviewed-by: Lars Knoll <lars.knoll@digia.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>
* | 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>
* | 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>
* 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>
* Fix typov5.3.0-rc1v5.3.0release5.3.0Sergio Ahumada2014-04-011-1/+1
| | | | | Change-Id: I4754f1bc1f9fb3e099fc7c7135ca0a933d9b7475 Reviewed-by: Mitch Curtis <mitch.curtis@digia.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-229-15/+15
| | | | | | | | remove trailing spaces & expand tabs Change-Id: Ic958087d8c50f3c51d767f5191e54c4079cc74a2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* 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>
* 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>
* make it possible to disable XML schema usagePeter Hartmann2013-11-152-8/+16
| | | | | | | | | | | | | | | | | | | | | | | 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>
* 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-051-2/+1
| | | | | | | | | | 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>
* Fix undefined behavior validating XSD substitution groupsMark Shroyer2013-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | 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>
* 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-261-1/+2
| | | | | Change-Id: Ia908aa03e0f6a0e4f92013ae84fc68ac73919d08 Reviewed-by: hjk <hjk121@nokiamail.com>
* 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>
* 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>
View Lorry Controller Status