summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.05.12.0Antti Kokko2018-11-121-0/+18
| | | | | Change-Id: I9a6cca0ad2e7d7e2c538ea707061b7774b8ed0e0 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Never call an object with a this ptr that is nullv5.12.0-beta4v5.12.0-beta3Lars Knoll2018-10-152-7/+14
| | | | | | Task-number: QTBUG-67936 Change-Id: Ie12c87f8aef30ebca887ad357393c86417d7d742 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta2v5.12.0-beta1v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
|\ | | | | | | Change-Id: I55333f0c79e50e48f0bc87277610766d13e3f1ba
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: I4607bb687882aeee262840f209a5047b6a2d211d
| | * Add changes file for Qt 5.11.2v5.11.25.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: I506d187978c501c5034fc5e33471020d1ad43e1d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I94fcf57af10329d571ccb9e413ec00f449bbd551
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: I9a3a459a2526fd28181e7504a1e2cae8daf9dce2
* | 3rdparty/javascriptcore: Add RISC-V supportAlistair Francis2018-07-261-2/+12
| | | | | | | | | | | | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Change-Id: I81f15084ef6b5b8d855c1f568cacca176af51b57 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-241-1/+2
|\ \ | |/ | | | | Change-Id: I76185a8b4e55514c54b285b0362ef8609bc0fce5
| * JavaScriptCore: Document snapshot dateKai Koehne2018-07-231-1/+2
| | | | | | | | | | | | Task-number: QTBUG-69276 Change-Id: I25394bc639d0b802d18f61ace678d4cfe6935861 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Replace use of deprecated function QTest::qWaitForWindowShownTor Arne Vestbø2018-07-181-1/+1
| | | | | | | | | | Change-Id: I7d92cb2be817eccd72232aa4bc16a41286ffdb44 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-301-1/+1
|\ \ | |/ | | | | Change-Id: Id34b2bc7a517d3d847b16c3c064593d4cf34f26e
| * Fix xml output to have valid UTF-8Jan Arve Sæther2018-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Some datatags had characters outside the ASCII range. (This is discouraged). And when dumping the datatag to xml output we dumped the binary content of the data tag without encoding it from latin1 to utf-8. This meant that all characters in the range 0x80-0xff produced invalid utf-8 sequences. The solution is to encode the data tag as UTF-8. Change-Id: Iaaecc992b756836845bfb98429f20f1fb5e2b291 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-234-43/+52
|\ \ | |/ | | | | Change-Id: Ieea89c3b8d092df29750074df133480e1b5d95d4
| * Remove dead test - compilerwarningsLiang Qi2018-06-221-43/+0
| | | | | | | | | | | | | | A follow-up of 9d078c8f147ea875e862360b0d7480201fbbcff7 in qtqa repo. Change-Id: I9e0a0564dabd468affd9fb5b5ac216eb54303dab Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Document licensesKai Koehne2018-06-192-0/+23
| | | | | | | | | | Change-Id: Iff237d048ead8e525ef79727fcaabb3043e8db65 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+29
| |\ | | | | | | | | | Change-Id: I1d6e64e9dad38c82dc2be5a2f71e8de7ae955a7f
| | * 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>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-122-0/+9311
|\ \ | |/ | | | | Change-Id: I01847ec8c11954f0d6d4bc8279c259424bc6e1c4
| * 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>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-042-0/+48
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9e509f7c6a1e9577eee2869fe69981738473361f
| * 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
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-261-4/+12
|\ \ | |/ | | | | Change-Id: I26d9146145cff1290913ca60ca16a2fc244b50ef
| * 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' into devQt Forward Merge Bot2018-05-121-0/+22
|\ \ | |/ | | | | Change-Id: Ie77814f897522052bbb7c9c4bc323ce3838a85f5
| * 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>
* | Make more includes bootstrap-compatibleJoerg Bornemann2018-04-193-4/+4
| | | | | | | | | | | | | | | | This amends commit fb7fdcbd. Change-Id: Ic537339ecfdc7054126f6fa280732add73984b12 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-146-43/+39
|\ \ | |/ | | | | Change-Id: I7b010b4d38e9141c083c4e79b4dd0d30c170e07f
| * 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>
* | Make style of Qt includes bootstrap build compatibleJoerg Bornemann2018-04-066-13/+13
| | | | | | | | | | | | | | | | | | | | This makes it easier to build QtScript against a stripped-down version of Qt. Change-Id: I492c3376e38f9f75b6a0f521ed4a0c1549c5970f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-271-0/+26
|\ \ | |/ | | | | Change-Id: I1155c2f71acd99b50695834c85bd8e6369258871
| * 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>
* | | | Bump versionOswald Buddenhagen2018-02-191-1/+1
|/ / / | | | | | | | | | Change-Id: I1b3f6fe603b2c292d6ebf698c6e120e8659c424f
* | | 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