summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-1231-118/+5409
|\ \ | |/ | | | | Change-Id: Iea8a806a7fe03bc52ffdae10b8459ce6cc275cc6
| * Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta2Liang Qi2017-04-1218-106/+28
| |\ | | | | | | | | | Change-Id: Iad56858cfdc688957e7a8426f908ab0a641a3312
| | * Cleanup implicit fallthroughs in xmlpatterns5.8Allan Sandfeld Jensen2017-03-3018-106/+23
| | | | | | | | | | | | | | | | | | | | | Use Q_FALLTHOUGH instead of comments, and use it consistently. Change-Id: Ieaf4867b612e624774011275b90cdd3678a29fe9 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| | * Mark missing implicit fallthroughsAllan Sandfeld Jensen2017-03-292-0/+5
| | | | | | | | | | | | | | | Change-Id: I92ab00eb63a5baac80c0ecc328141396bf7331bd Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * | Fix gcc 7 buildVille Voutilainen2017-04-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | We seem to get something that looks very much like a false positive for a maybe-uninitialized value. Disable -Wmaybe-uninitialized in the offending header file. Change-Id: If79bc7798df50f4dd0dcf63399213b4e4a7cdbd3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Build fix for -no-feature-timezonev5.9.0-beta1Paul Olav Tvete2017-03-161-0/+4
| | | | | | | | | | | | | | | Change-Id: I54b491fce5b38e0a10c939ec4cc69474ff594e1e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-108-9/+5369
| |\ \ | | |/ | | | | | | Change-Id: I5b9e062ecc418e499805e3e62964993a87016bdc
| | * Drop unused QProcess includeUlf Hermann2017-03-061-1/+0
| | | | | | | | | | | | | | | Change-Id: I4f34c217bc997e24b0a13a432cb803d09f6fe314 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * Fix previous fix for trailing 0 handlingKarim Pinter2017-02-085-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous fix, 82c5cc6532ac5d0323ecda94b6767e1fdaef2639, wasn't handling properly double conversion to string, this change is rather going through the characters instead. It also adds new test cases. Task-number: QTBUG-58245 Change-Id: I1563d541b0c9fef1254b5fb728308fb2517ed3aa Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * Binary compatibility file for qtxmlpatterns (5.8.0)Milla Pohjanheimo2017-02-031-0/+5315
| | | | | | | | | | | | | | | | | | | | | Added binary compatibility file for qtxmlpatterns Change-Id: I4a879e0211635a5f69dd092d203651186cfd8f09 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| | * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-261-0/+16
| | |\ | | | | | | | | | | | | Change-Id: I49449c321d5ca3df584db712409ed6677f548e9d
| | | * Add changes file for 5.8.0v5.8.05.8.0Jani Heikkinen2016-12-221-0/+16
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib834d859af93bf7541fad0609e2605b41ec98458 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | | Fix QRegExp includesSamuel Gaist2017-03-012-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing QRegExp includes in preparation for the qtbase include cleanup. Change-Id: Iad019a697d785e351f639b685a5d8c6a86e1f161 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | | Fix script to regenerate files using qtokenautomatonFriedemann Kleint2017-02-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends 973105d9fb3372910255825e7395fb1156e24c02. Change-Id: Ife3c926e9259e48b1e4c433311f78b80cc69220a Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
View Lorry Controller Status