summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-293-88/+49
|\ | | | | | | Change-Id: I09553d29eab1e65fc3e51d72ff6ea6682794d312
| * Improve documentation for w3c's xml.xsd fileKai Koehne2018-01-263-88/+49
| | | | | | | | | | | | | | | | | | | | | | | | Use the qt_attribution.json setup, instead of hardcoding the license in the documentation. Also update the license to the latest W3C one, that supersedes the old license even for exising documents. [Third-Party Code] Update license of w3c'c xml.xsd file. Change-Id: I59a8a6f9d97ad89e530eb4cd30b1f4e1a725fcf4 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Fix access after free in evaluation cacheAllan Sandfeld Jensen2018-01-252-2/+2
| | | | | | | | | | | | | | | | | | If a let expression is compressed away to just its value, let the value keep a reference to the variable declaration. Task-number: QTBUG-63613 Change-Id: I544ca682627c0fc0fe13984602aefbaaf3df4533 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-181-0/+25
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id91fb508787683912928d16ac54e18b30eed0f18
| * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| |\ | | | | | | | | | Change-Id: I2f4e95418e26b29b2f3428f3bd18ec40079b60d3
| | * Add changes file for Qt 5.9.4v5.9.45.9.4Antti Kokko2018-01-081-0/+25
| | | | | | | | | | | | | | | Change-Id: I91420c38715431220b15b65226e9ce67cd58d488 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Fix license headersJani Heikkinen2018-01-064-1389/+20
| |/ | | | | | | | | | | | | | | - Replace old header.LGPL21 usage with header.LGPL one - Remove unnecessary license files Change-Id: Ie5ac3785daa1805aef8eb2c5176c95c51523259a Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | Change-Id: I8cb1eae162236203f6cbf7f4fbff8cc45b121007
| * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| |\ | | | | | | | | | Change-Id: I3630d8a56d8eca3c250c1a0a6bbe4993f110dad0
* | | Fix license headersJani Heikkinen2018-01-155-1411/+20
| | | | | | | | | | | | | | | | | | | | | | | | old header.LGPL21 was still used in one src file. Replace that one with correct header.LGPL one. Remove also unnecessary license files. Change-Id: I02126d6114ca04dffbd488610195919b67fdd96c Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Significantly improve memory usage in XsdStateMachine::toDFAViktor Engelmann2018-01-041-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now mark DFA state sets immediately when they are enqueued and check for that mark before enqueing them. This way, we save a lot of memory when a set has many states and is encountered often. In the referenced bug report, there were 60000 copies of a set with 40000 entries, wasting tens of gigabytes of memory. Task-number: QTBUG-65067 Change-Id: Iec3a04c8badfac29faefbba22c2942ed104effbb Reviewed-by: Kari Hormi <kari.hormi@qt.io> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | Change-Id: I7745fdd17b32c84db79721208c35ff58a9432bb9
* | | Add binary compatibility file for QtXmlPatterns for 5.10Milla Pohjanheimo2017-12-141-0/+5656
| | | | | | | | | | | | | | | | | | | | | File to test binary compatibility added for 5.10 Change-Id: I31bbf17220c3b36eaf3d6d6cd2626d3fb5791f99 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-082-0/+46
|\ \ \ | | | | | | | | | | | | Change-Id: Ic4ac119a1ff110d93ab76969539e38e8aa166aa6
| * \ \ Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0Liang Qi2017-11-211-0/+24
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: Ida2b2e16b0674a8639a8ae0bd3e7bccd5f3085b7
| | * | Add changes file for Qt 5.9.3v5.9.35.9.3Antti Kokko2017-11-081-0/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: I0828b721ce19dd704b7230feb89aa3d704982b87 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | | Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-203-9/+11
| |\ \ \ | |/ / / |/| | | | | | | Change-Id: I30123ba9baea5b669fe1e19112225f2e737c70e9
* | | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-153-9/+11
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: Idcfaa401ee18ab56f63d2089eca666be12abadcd
| * | | Fix clazy-temporary-iteratorFriedemann Kleint2017-11-143-9/+11
| | |/ | |/| | | | | | | | | | Change-Id: I512ffb927cfa161fc810c846a7b57b02601b14b9 Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
| | * Add changes file for Qt 5.10.0Antti Kokko2017-11-121-0/+22
| |/ |/| | | | | | | Change-Id: Ibf1a2c7e899b19298127d6b5551e6ef50f1dc72d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-3041-135/+483
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I03793037d5cb382a3ea411286633903e4fee60ce
| * Fix outdated FDL license headerKai Koehne2017-10-179-45/+45
| | | | | | | | | | Change-Id: I50ac50f96c8ac4bf7023b9488e6a634d3f71e583 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Fix outdated BSD license headerKai Koehne2017-10-1730-90/+390
| | | | | | | | | | Change-Id: I90b4636aeaf7465f5938ff3454d735cf67816d98 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | Change-Id: I3605602b477d2a6ea68ae2e00651651671ac90e4
| * Add changes file for Qt 5.9.2v5.9.25.9.2Antti Kokko2017-09-251-0/+24
| | | | | | | | | | Change-Id: I0b1f8b2ae068c1f6489d67fd4a4db51e275b4ad5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Add change file for Qt 5.6.3Antti Kokko2017-09-011-0/+24
| | | | | | | | | | | | | | | | | | This is just initial commit. Maintainers, please take over this, do needed modifications & get approved as soon as possible Task-number: QTBUG-62723 Change-Id: I34d12daba918b9ebfe6f3404219b75b72f8f6f85 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | examples: minor code revamping in recipesv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1Gatis Paeglis2017-09-263-10/+11
| | | | | | | | | | | | Task-number: QTBUG-60660 Change-Id: I396f64c770f4ccbf5b2bbd6240ccb4618df70b23 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | examples: remove traces of the Maemo and Q_WS_SIMULATORGatis Paeglis2017-09-268-243/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Maemo part: This kind of amends what was done in qtbase 2 years and 7 months ago by 5432f2c7a1ff02e1ee0e07e442ceb6c12ca66098. Q_WS_SIMULATOR part: This was all dead code, because nothing sets Q_WS_SIMULATOR in Qt 5. Change-Id: I8af66123e332cd8911a73c11893d674b8102e474 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Win: Show proper descriptions for toolsKai Koehne2017-09-212-0/+2
| | | | | | | | | | | | Task-number: QTBUG-61970 Change-Id: Ia328bb40e8a5f607d5e1ba33f4386ad250fbbd7d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | remove wince leftoversGatis Paeglis2017-09-191-9/+0
| | | | | | | | | | Change-Id: I0579f73576722ebe68c3574f48934b15997aa035 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix autotest failure in tst_QXmlQuery::relativeBaseURI()v5.10.0-alpha1Eirik Aavitsland2017-08-161-4/+3
| | | | | | | | | | | | | | | | | | | | The test (mis)used undocumented QFileInfo behavior, which was changed in qtbase 6504bc6bbc9276fe1a26c1af53c202371f334416. Fix the test to use the proper QFileInfo call. Task-number: QTBUG-62547 Change-Id: Ia95b6a4c471053a9cf8a17afac948771ca1b64c8 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-161-0/+5335
|\ \ | |/ | | | | Change-Id: I2355b70b6fe99c05b5bfdaadd81ea47be45d304b
| * Update binary compatibility file for Qt5.9.0 for QtXmlPatternsMilla Pohjanheimo2017-08-151-0/+5335
| | | | | | | | | | | | | | Binary compatibility file for Qt 5.9.0 updated. Change-Id: Ibdc9836cc9c46e367f49603df76552eee23719f3 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-07-214-24/+46
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If5ed6ad45422c7cf8a250e31a10ce2930e5c1cf7
| * Autotest: adapt to qt_error_string() now returning Win32 messagesThiago Macieira2017-07-211-0/+10
| | | | | | | | | | | | | | Instead of Unix "No such file or directory". Change-Id: I84e45059a888497fb55ffffd14d32409773e38fe Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-0/+24
| |\ | | | | | | | | | Change-Id: I13c8b1c155a36a3e321247ce7ac789a9ca23f94e
| | * Add Qt 5.9.1 changes filev5.9.15.9.1Jani Heikkinen2017-06-191-0/+24
| | | | | | | | | | | | | | | Change-Id: I03f77fbbcdbba123634896f76e10500b1506eafd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | | | | | Change-Id: Ib8fb4def07fd5961958967d8abea700e1dd3572a
| * | qxquerytokenizer.cpp: Fix -Wimplicit-fallthroughFriedemann Kleint2017-06-201-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the Q_ASSERT following the return statements in the switch. Fixes numerous warnings: parser\qxquerytokenizer.cpp:825:28: warning: this statement may fall through [-Wimplicit-fallthrough=] Q_ASSERT(false); Change-Id: I921b4a61f7751f7a55c708ed182806e76e7d75e7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Fix compilation error with ICC 17: it doesn't like auto and commaThiago Macieira2017-06-201-4/+12
| |/ | | | | | | | | | | | | | | | | | | | | The error is a warning upgraded via -Werror and the message doesn't even make sense to me: error #3373: nonstandard use of "auto" to both deduce the type from an initializer and to announce a trailing return type Intel-Issue-ID: 6000164202 Change-Id: I73fa1e59a4844c43a109fffd148caf09a1952e92 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix GCC 7 warning about fallthroughThiago Macieira2017-06-121-1/+1
| | | | | | | | | | Change-Id: Ia53158e207a94bf49489fffd14c738808be5a6b9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix GCC 7 fallthrough warningsThiago Macieira2017-07-031-1/+1
| | | | | | | | | | | | | | warning: this statement may fall through [-Wimplicit-fallthrough=] Change-Id: I8d96dea9955d4c749b99fffd14cd50c152aaa6fe Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-075-8/+30
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ieff26ce785aea28ebabdec2aa3364efbd59c1456
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+16
| |\ | | | | | | | | | Change-Id: Icda21f65bf7df6c2bfd1eb36142f873dc15e81a5
| | * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.0-beta4v5.9.05.9.0Antti Kokko2017-05-051-0/+16
| | | | | | | | | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: I264a2e6797a89b61bc215e19444e9bb8d7f881d9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Bump versionOswald Buddenhagen2017-05-101-1/+1
| | | | | | | | | | | | Change-Id: If9caa80c2a21dc3d0cca2522ae9de9c401c52fd2
| * | Add section and update purpose of features.xml-schemaStephan Binner2017-05-081-1/+2
| |/ | | | | | | | | Change-Id: Ica28866669aea9e1fb4d0d586bbcce87dd6afa95 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Make features.xml-schema publicFeatureStephan Binner2017-05-031-1/+1
| | | | | | | | | | | | | | | | QXmlSchema[Validator] are in public Qt API Change-Id: I6103f1e7d88bf878776556793f78607e741dfee1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Pass system environment to processes invoked from tst_xmlpatternsSami Nurmenniemi2017-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | This fixes test run with QEMU, which needs QEMU environmental variables passed also to the process invoked from it. Task-number: QTBUG-60266 Change-Id: Icc77f36aa6107043e0845680c2fd4fbf33a7e4e2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * QXmlName: Add copy constructor and use default for copy/assignmentv5.9.0-beta3Friedemann Kleint2017-04-202-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
View Lorry Controller Status