summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | 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.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.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>
* | 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>
| | * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-261-1/+1
| | |\ | | | | | | | | | | | | Change-Id: Ie2fd8a4163d05cf2976e129b4fb35a2d1d023f0a
| | | * Doc: Fix name of license filev5.8.0-rc1v5.8.05.8.0Kai Koehne2016-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I0acd5d4b3a1819c9ff23008432410d2c6d83b1c5 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | | Bump versionOswald Buddenhagen2017-02-021-1/+1
|/ / / | | | | | | | | | Change-Id: I455459eee0d7b4815d1ef88d13581bbda9361a08
* | | Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1Liang Qi2017-01-255-1/+163
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I593c05d4dd860dd24ef13d446c700a65d96496f3
| * | No need to define c99 math functions in c++11 modeJulien Gueytat2017-01-221-1/+1
| | | | | | | | | | | | | | | Change-Id: I1fda733135714a6b4733b04e6ae40354deb6c818 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | | | | | Change-Id: I2a7ff73c6cf17262daab3c3fc228b999f3f53e38
| * | Document third party code in tests/benchmarksKai Koehne2016-12-204-0/+162
| | | | | | | | | | | | | | | Change-Id: Iab0d36f7ad8aaced8a24b2959d810a459f244983 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-1220-752/+16699
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6c9ecff3a336c5183aa631e7ce600e99f9594dd5
| * | Port to new feature systemFriedemann Kleint2016-12-022-4/+4
| |/ | | | | | | | | | | | | | | | | Build tools depending on feature 'textedit'. Fix warnings qtscript/src/scripttools/scripttools.pro:1: Cannot find feature qfeatures Change-Id: I96b403668164c4821cdebf1b13043e9f92c129ea Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-261-11/+0
| |\ | | | | | | | | | Change-Id: I3b028824ded47a07b3ef32ec73a8446a253dfb06
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-11/+0
| | |\ | | | | | | | | | | | | Change-Id: I6736b472be078c5030428f25bd191f21006e141e
| | | * remove dependencies from sync.profileOswald Buddenhagen2016-11-061-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: If665f5707aee126ebaffa0b6340a6229b35b1c43 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | Document 3rd party libraryv5.8.0-beta1Kai Koehne2016-10-242-2/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also use \badcode .. \encode instead of \legalese, because the latter does not stand out. Change-Id: I2dd2d1bf68706cce98e9864fb6980afb96b2ec03 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * | | Remove ce-compat filesKai Koehne2016-10-203-715/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not support Windows CE anymore, and this is one less 3rd party license we do not need to document. Change-Id: I006d6c9bebd74421965c41e48a92bd9df66f6bd0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-freeMarc Mutz2016-09-238-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I13a4ce5c268da2b97cbae6612d240398b17186ef Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-194-0/+16614
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ie199d987383f325629fb31dad05197e80af7bf3c
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.15.7.1Liang Qi2016-09-172-0/+8025
| | |\ \ | | | |/ | | | | | | | | Change-Id: I0bfcc2e93ff7a4f7faf85cd0dbef8d5310ad9dcc
| | | * BC data files for QtScript for Qt 5.6Milla Pohjanheimo2016-09-142-0/+8025
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added binary compatibility data files for tst_bic test Change-Id: I53825b45c8e833f460cc4271da36b09dc3aad2d0 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| | * | BC data files added for QtScript (5.7)Milla Pohjanheimo2016-09-152-0/+8589
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the generated data files for the binary compatibility tests for QtScript for Qt 5.7. Change-Id: I7ba1e7729b75751cf15e58a6e4be42c3ad1efd8c Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | | Bump versionOswald Buddenhagen2016-08-291-1/+1
|/ / / | | | | | | | | | Change-Id: I9a8f504605ab747c66c50334a31fcb2f679e89d8