summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.11.1v5.11.15.11.1Antti Kokko2018-06-131-0/+29
| | | | | Change-Id: I348df8100219d958e74a382e2caa3f514900a09a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add binary compatibility files for 5.11 for QtScriptMilla Pohjanheimo2018-06-052-0/+9311
| | | | | | | Binary compatibility files for bic test added. Change-Id: Iffb27b08eddbccfb8519f1b4f4881ead5737a56a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Add changes file for Qt 5.9.6Antti Kokko2018-06-011-0/+24
| | | | | | | Change-Id: Iaec858829405048c794eaea22734c8c7292448f0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit bc1c3fb95cee0ee525642bd308abbff21572505e) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Add changes file for Qt 5.9.5Antti Kokko2018-06-011-0/+24
| | | | | | | Change-Id: I03394be1e63628cec625b3386b88253943949e64 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit b67dcb4883e762269a49606b58ba0f77fdb25008) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | Change-Id: Icc8a1d0727a9495ebb6cb07f1b38cdf74ccebf8a
* Fix QtScript on 64-bit systems with gcc 8Simon Hausmann2018-05-231-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | Similar to commit 92836d052efb6d8073136e8507083f93fb60bb80 in qtdeclarative, we must use memcpy to do a bit-wise conversion from the JSCell *m_ptr to an intptr_t for JSValue tag operations. This fixes the referenced task and all the failing auto-tests. The most visible result was that if ((jsvalue.immediateValue() & 0xffff000000000000ll) == 0xffff000000000000ll) return static_cast<int32_t>(jsvalue.immediateValue()); was "optimized" to "return 0", breaking QScriptValue::toNumber() for integer encoded values. [ChangeLog][QtScript] Fix incorrect script evaluations on 64-bit systems with gcc 8. Change-Id: I525b6b66d0e3c5163ad7e338fd0e866cdf620dad Task-number: QTBUG-68367 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
|\ | | | | | | Change-Id: Ic290d205229a5e849bc7fc20c2f03ecde68e7c34
| * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.05.11.0Antti Kokko2018-04-201-0/+22
|/ | | | | Change-Id: I8af53d98fdd0621cb41afe99f13bbcb2dfab365a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Doc: Fix documentation warningsv5.11.0-beta4Topi Reinio2018-04-136-43/+39
| | | | | | | | | | | Use complete function signatures for \fn commands (including template specifiers) as Clang parser now reads them. Convert internal class documentation comments to standard C-style comments. Change-Id: Ie67eb054171139db12f7e74d077b7dc8453582df Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta3v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8eccb5b41efe3b395c70f3ef0d3cb1f663e2edbf
| * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | Change-Id: Ie67b221373ac6e7d793d358a1f1d724e8d23597b
* | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
|\ \ | | | | | | | | | Change-Id: I14108ace488c8278df7babf11f333a032c9ba97c
| * | Add changes file for Qt 5.10.1v5.10.15.10.1Antti Kokko2018-02-061-0/+26
| | | | | | | | | | | | | | | Change-Id: I1e7ae57fb39d8825f4051c7a77c6d0f289ac7c45 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-201-0/+25
|\ \ \ | |/ / | | | | | | Change-Id: Ia28ef49b2f708a4af918c3ff22655ed65a0249c0
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-191-0/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/plugins/script/qtdbus/main.cpp src/plugins/script/qtdbus/main.h src/script/api/qtscriptglobal.h src/script/parser/make-parser.sh src/script/parser/qscript.g src/scripttools/debugging/qscriptbreakpointdata.cpp src/scripttools/debugging/qscriptbreakpointdata_p.h src/scripttools/debugging/qscriptbreakpointsmodel.cpp src/scripttools/debugging/qscriptbreakpointsmodel_p.h src/scripttools/debugging/qscriptbreakpointswidget.cpp src/scripttools/debugging/qscriptbreakpointswidget_p.h src/scripttools/debugging/qscriptbreakpointswidgetinterface.cpp src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_p.h src/scripttools/debugging/qscriptcompletionproviderinterface_p.h src/scripttools/debugging/qscriptcompletiontask.cpp src/scripttools/debugging/qscriptcompletiontask_p.h src/scripttools/debugging/qscriptcompletiontaskinterface.cpp src/scripttools/debugging/qscriptcompletiontaskinterface_p.h src/scripttools/debugging/qscriptcompletiontaskinterface_p_p.h src/scripttools/debugging/qscriptdebugger.cpp src/scripttools/debugging/qscriptdebugger_p.h src/scripttools/debugging/qscriptdebuggeragent.cpp src/scripttools/debugging/qscriptdebuggeragent_p.h src/scripttools/debugging/qscriptdebuggeragent_p_p.h src/scripttools/debugging/qscriptdebuggerbackend.cpp src/scripttools/debugging/qscriptdebuggerbackend_p.h src/scripttools/debugging/qscriptdebuggerbackend_p_p.h src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h src/scripttools/debugging/qscriptdebuggercodeview.cpp src/scripttools/debugging/qscriptdebuggercodeview_p.h src/scripttools/debugging/qscriptdebuggercodeviewinterface.cpp src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_p.h src/scripttools/debugging/qscriptdebuggercodewidget.cpp src/scripttools/debugging/qscriptdebuggercodewidget_p.h src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_p.h src/scripttools/debugging/qscriptdebuggercommand.cpp src/scripttools/debugging/qscriptdebuggercommand_p.h src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend.cpp src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend_p.h src/scripttools/debugging/qscriptdebuggercommandschedulerinterface_p.h src/scripttools/debugging/qscriptdebuggercommandschedulerjob.cpp src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p_p.h src/scripttools/debugging/qscriptdebuggerconsole.cpp src/scripttools/debugging/qscriptdebuggerconsole_p.h src/scripttools/debugging/qscriptdebuggerconsolecommand.cpp src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h src/scripttools/debugging/qscriptdebuggerconsolecommand_p_p.h src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h src/scripttools/debugging/qscriptdebuggerconsolecommandjob.cpp src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p_p.h src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h src/scripttools/debugging/qscriptdebuggerconsolehistorianinterface_p.h src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface.cpp src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_p.h src/scripttools/debugging/qscriptdebuggerevent.cpp src/scripttools/debugging/qscriptdebuggerevent_p.h src/scripttools/debugging/qscriptdebuggereventhandlerinterface_p.h src/scripttools/debugging/qscriptdebuggerfrontend.cpp src/scripttools/debugging/qscriptdebuggerfrontend_p.h src/scripttools/debugging/qscriptdebuggerfrontend_p_p.h src/scripttools/debugging/qscriptdebuggerjob.cpp src/scripttools/debugging/qscriptdebuggerjob_p.h src/scripttools/debugging/qscriptdebuggerjob_p_p.h src/scripttools/debugging/qscriptdebuggerjobschedulerinterface_p.h src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface.cpp src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_p.h src/scripttools/debugging/qscriptdebuggerobjectsnapshotdelta_p.h src/scripttools/debugging/qscriptdebuggerresponse.cpp src/scripttools/debugging/qscriptdebuggerresponse_p.h src/scripttools/debugging/qscriptdebuggerresponsehandlerinterface_p.h src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h src/scripttools/debugging/qscriptdebuggerscriptsmodel.cpp src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_p.h src/scripttools/debugging/qscriptdebuggerstackmodel.cpp src/scripttools/debugging/qscriptdebuggerstackmodel_p.h src/scripttools/debugging/qscriptdebuggerstackwidget.cpp src/scripttools/debugging/qscriptdebuggerstackwidget_p.h src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_p.h src/scripttools/debugging/qscriptdebuggerstandardwidgetfactory.cpp src/scripttools/debugging/qscriptdebuggerstandardwidgetfactory_p.h src/scripttools/debugging/qscriptdebuggervalue.cpp src/scripttools/debugging/qscriptdebuggervalue_p.h src/scripttools/debugging/qscriptdebuggervalueproperty.cpp src/scripttools/debugging/qscriptdebuggervalueproperty_p.h src/scripttools/debugging/qscriptdebuggerwidgetfactoryinterface_p.h src/scripttools/debugging/qscriptdebugoutputwidget.cpp src/scripttools/debugging/qscriptdebugoutputwidget_p.h src/scripttools/debugging/qscriptdebugoutputwidgetinterface.cpp src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_p.h src/scripttools/debugging/qscriptedit.cpp src/scripttools/debugging/qscriptedit_p.h src/scripttools/debugging/qscriptenginedebugger.cpp src/scripttools/debugging/qscriptenginedebugger.h src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h src/scripttools/debugging/qscripterrorlogwidget.cpp src/scripttools/debugging/qscripterrorlogwidget_p.h src/scripttools/debugging/qscripterrorlogwidgetinterface.cpp src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h src/scripttools/debugging/qscripterrorlogwidgetinterface_p_p.h src/scripttools/debugging/qscriptmessagehandlerinterface_p.h src/scripttools/debugging/qscriptobjectsnapshot.cpp src/scripttools/debugging/qscriptobjectsnapshot_p.h src/scripttools/debugging/qscriptscriptdata.cpp src/scripttools/debugging/qscriptscriptdata_p.h src/scripttools/debugging/qscriptstdmessagehandler.cpp src/scripttools/debugging/qscriptstdmessagehandler_p.h src/scripttools/debugging/qscriptsyntaxhighlighter.cpp src/scripttools/debugging/qscriptsyntaxhighlighter_p.h src/scripttools/debugging/qscripttooltipproviderinterface_p.h src/scripttools/debugging/qscriptvalueproperty.cpp src/scripttools/debugging/qscriptvalueproperty_p.h src/scripttools/debugging/qscriptxmlparser.cpp src/scripttools/debugging/qscriptxmlparser_p.h tests/auto/compilerwarnings/data/test_cpp.txt tests/auto/qscriptable/tst_qscriptable.cpp tests/auto/qscriptclass/tst_qscriptclass.cpp tests/auto/qscriptcontext/tst_qscriptcontext.cpp tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp tests/auto/qscriptengine/tst_qscriptengine.cpp tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.cpp tests/auto/qscriptextensionplugin/staticplugin/staticplugin.cpp tests/auto/qscriptextensionplugin/tst_qscriptextensionplugin.cpp tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp tests/auto/qscriptqwidgets/tst_qscriptqwidgets.cpp tests/auto/qscriptstring/tst_qscriptstring.cpp tests/auto/qscriptv8testsuite/abstracttestsuite.cpp tests/auto/qscriptv8testsuite/abstracttestsuite.h tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tests/auto/qscriptvaluegenerated/tst_qscriptvalue.cpp tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp tests/auto/shared/util.h tests/benchmarks/script/context2d/tst_context2d.cpp tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp tests/benchmarks/script/qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp tests/benchmarks/script/qscriptqobject/tst_qscriptqobject.cpp tests/benchmarks/script/qscriptvalue/tst_qscriptvalue.cpp tests/benchmarks/script/qscriptvalueiterator/tst_qscriptvalueiterator.cpp tests/benchmarks/script/sunspider/tst_sunspider.cpp tests/benchmarks/script/v8/tst_v8.cpp Change-Id: I4b4c7940d26ea5760d58620f4c53e96fad84af76
| | * Add changes file for Qt 5.9.4v5.9.45.9.4Antti Kokko2018-01-051-0/+25
| | | | | | | | | | | | | | | Change-Id: I3837fb702fc72981684b204f3b3123bc16e990a1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Fix license headersJani Heikkinen2017-12-21185-2640/+3701
| | | | | | | | | | | | | | | | | | | | | | | | | | | Old header.LGPL21 header was used at some files. Replase those with new header.LGPL one Task-number: QTBUG-57147 Change-Id: I35d2b6022d33cbcb9cc93479d325719bc9224837 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: Ieb19443d3b62121de5306c5ff10806a40961a847
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-18194-3477/+13916
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I77f29cac3182808e0b9601f3415c9740b8f0fa88
| * | Fix license headersJani Heikkinen2018-01-15192-3477/+4605
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old header.LGPL21 was used in some src and test files. Replace ones in src/ with correct header.LGPL one and ones in tests/ with correct header.GLP-EXCEPT one. Also add correct license files and remove unnecessary ones Change-Id: Ifc7bb0f25bd9df652ddafe0faceaebd52b495bef Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | Change-Id: I4340186e3b148b18c29a3fe68ecf36eacb0d9314
| * | Add binary compatibility files for QtScript for 5.10Milla Pohjanheimo2017-12-142-0/+9311
| | | | | | | | | | | | | | | | | | | | | Added files to test binary compatibility for 5.10 content. Change-Id: Ief15330d06edaeca49b57fed5ff3eb43478248e4 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-202-0/+13
|\ \ \ | |/ / | | | | | | Change-Id: I9c2e72efdbd5fa852aff22a3070ac72f092fb880
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0-beta4v5.10.05.10.0Liang Qi2017-10-302-0/+13
| |\ \ | | |/ | | | | | | Change-Id: I3474042cd7fe3d2fc2864298bbb79796b9757da0
| | * Blacklist and skip failing tests for Boot2Qt / 64 bit armv5.9.35.9.3Sami Nurmenniemi2017-10-202-0/+13
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-60263 Change-Id: I1848a0a4d5927b114400bc1646e1a676562cbf46 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-1867-275/+719
|\ \ \ | |/ / | | | | | | Change-Id: Idebaee1835329337ee03e27e9499b951a5cdb907
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3Liang Qi2017-10-1865-207/+719
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf qtscript.pro Change-Id: If0f8875c8af2afb717ba394fac4e506076f01517
| | * Fix outdated BSD license headerKai Koehne2017-10-1751-151/+661
| | | | | | | | | | | | | | | Change-Id: I191edb211ed6cffce17b0a5b7656691ce41b754c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Fix outdated FDL license headerKai Koehne2017-10-1711-55/+55
| | | | | | | | | | | | | | | Change-Id: I8e2e863f4a9f05b577f63a233654785a6d294387 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: Ib778c9578c44deb5b5fb0a7d49eaf3656c8014f5
| | * Exclude the QtScript module from the VxWorks buildv5.9.25.9.2Jake Petroules2017-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It doesn't compile on that platform. Change-Id: If7ece34a068a91ed269e7a68ac6b400d35ba7440 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| | * Fix missing license informationKai Koehne2017-08-292-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings of qtattributionscanner: File ./tests/benchmarks/script/sunspider/tests/qt_attribution.json: Missing mandatory property 'License'. File ./tests/benchmarks/script/v8/tests/qt_attribution.json: Missing mandatory property 'License'. Change-Id: I0ab99b62d8abfd333b2208afd611d494f4e3ed5d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * | JavaScriptCore: Remove stdint.h used for Windowsv5.10.0-beta2Friedemann Kleint2017-10-132-68/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file shadows the compiler's stdint.h and is insufficient to be able to compile QObject which includes <chrono> after qtbase:6d1d66a0429d2eb36beb192112b9a7bb8ae00b9a. Task-number: QTBUG-63761 Change-Id: I48083f375fda7dd491997c7c9c04722532a6152c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Fix test checking QVector<int> not being registeredFrederik Gladhorn2017-10-041-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In qtbase 2b1ab81edaf19042d11b4ac1836f527c8590ee45 the basic types registered by DBus got extended to QVector, in addition to QList. This broke the assumption in the QObject test that QVector<int> wasn't registered yet. Use a custom type for this check instead. Task-number: QTBUG-63432 Change-Id: Ib6a405a6bcb2ee2c294b3260b89c567712c49a63 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-274-6/+6
| | | | | | | | | | | | | | | Change-Id: I9b2a6ce4a0278520fd95042a1b2736cc5a0d4be6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Bump versionFrederik Gladhorn2017-09-041-1/+1
|/ / | | | | | | Change-Id: Iec91b6ba36065e7886384bcfdbbef3dc93f1d4e7
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta1v5.10.0-alpha1Liang Qi2017-08-152-2/+4
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3096cfb19971b774e1c1e320c8c99f7a52b4fd2c
| * Disable c++1z as it breaks compilation with libc++5Tobias C. Berner2017-07-031-0/+3
| | | | | | | | | | | | | | | | Change-Id: I7efa59433cd06ee8ff43d231e6ff1d4712fe65aa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | Change-Id: I6a3390c430ed541c8a311c7da77072336afaea63
| * Doc: Fix copyright line for JavaScriptCorev5.9.15.9.1Kai Koehne2017-06-081-2/+1
| | | | | | | | | | | | | | | | The 1984 and later copyrights are all for the FSF from the Bison output files. Change-Id: I857995eda4ed92ef6196ae47e308d385a67edd79 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Use qRadiansToDegrees() instead of hand-coding an equivalentEdward Welbourne2017-06-211-8/+4
| | | | | | | | | | | | | | | | The homegrown approximation to pi's value caught my attention. Task-number: QTBUG-58083 Change-Id: I2bf0432f4c71c20131ef48cdd8341cdb9bc098bc Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-071-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf qtscript.pro Change-Id: I82c6b48ebb96a574f5cba6ffbca6e37b0bef8891
| * Bump versionOswald Buddenhagen2017-05-101-1/+1
| | | | | | | | Change-Id: I6f1f2345895c7dfaabd7685104da47c3895810ec
| * Exclude the QtScript module from INTEGRITY buildv5.9.0-rc2v5.9.0-rc1v5.9.0-beta4v5.9.0-beta3v5.9.0-beta2v5.9.0-beta1v5.9.05.9.0Kimmo Ollila2017-03-271-1/+1
| | | | | | | | | | | | | | | | This module is not (yet) supported on INTEGRITY and therefore we'll exclude it from the CI build. Change-Id: Icb882923b0d78e0c2e1e5167ce5c5778ac22a030 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Exclude the QtScript module from the tvOS and watchOS buildsJake Petroules2017-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | This module is not supported on tvOS or watchOS (and probably won't be, since several required functions like sbrk() are unavailable on these platforms and there is also little point adding support for deprecated modules on new platforms) and therefore we'll exclude it from the CI build. Change-Id: Ib34dcdd52013d8e9320f6e31c34f4ce7aa6477f4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-225-18/+8657
|\ \ | |/ | | | | Change-Id: Ib7aaef28dcf5fa418c05e66c13ba0c3f1e6f402f
| * MSVC: Disable warning C4577Friedemann Kleint2017-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, the build fails with: warning C4577: 'noexcept' used with no exception handling mode specified; termination on exception is not guaranteed. Specify /EHsc since Qt Script does not specify an exception mode. Task-number: QTBUG-59645 Change-Id: I5cb38286cab2f9b449f6f8d7ab3fe9ee898587e4 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Remove uses of QString::nullMarc Mutz2017-03-101-16/+16
| | | | | | | | | | | | | | It's going to be deprecated. Change-Id: I8c126427c8d888a7d0c8bf12a5a5aade31cb6afd Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-103-1/+8640
| |\ | | | | | | | | | Change-Id: I5fbe8cb890c50bbd8a6b39e142089570b7a686b2
| | * Binary compatibility files for qtscript (5.8.0)5.8Milla Pohjanheimo2017-02-062-0/+8639
| | | | | | | | | | | | | | | | | | | | | Added binary compatibility files for qtscript Change-Id: I6fa8f9537b43ec31fcd3ad962a0873510860870e Reviewed-by: Sergio Ahumada <sahumada@texla.cl>