summaryrefslogtreecommitdiffstats
path: root/src/script
Commit message (Collapse)AuthorAgeFilesLines
* Fix moc patches in QObjectConnectionManagerIvan Komissarov2021-02-111-2/+33
| | | | | | | | | Since qt6, the moc implementation has been changed. Apply fixes accordingly. Change-Id: I3f6894a0e5b0dc8569441275a3f9756bfecd8adf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Fix object destruction orderIvan Komissarov2021-02-081-3/+3
| | | | | | | The string should be destroyed before its data. Change-Id: I99034c58dd46c4589941aca066b3fae65a406fcd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Do not use QDateTime(QDate) ctorIvan Komissarov2021-02-081-1/+1
| | | | | | | | ...it is gone Change-Id: I03801c8e69bfaeccbaf0444fa4556f9390241677 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix using QT_DEPRECATED macroIvan Komissarov2021-02-081-2/+2
| | | | | Change-Id: I470ba90a8cca30ef85a8c985e3b1106c60f3b2b4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qt6: remove QStringList forward-declarationIvan Komissarov2021-02-081-1/+0
| | | | | | | It is not a class anymore Change-Id: I1e2d43b932ac610261ea8de4bef56ccdaf8e1fae Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix QRegExp usagesIvan Komissarov2021-02-073-19/+25
| | | | | Change-Id: Ibebe73c32ceacf5964455918e3e0a2c641b8096e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add createVariant functionIvan Komissarov2021-02-073-8/+19
| | | | | | | ...to work around changed QVariant's ctor signature Change-Id: I3c7d9dc7d64a2ee609fbf10ee9527a5fe0a24f9c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Use QAtomicInt::load/storeRelaxed intead of load/store()Ivan Komissarov2021-02-071-7/+7
| | | | | | | ...which were removed in Qt6 Change-Id: I19305e0276d814811cf76ed39769bf05172d0801 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-1866-533/+1589
|\ | | | | | | Change-Id: If612d1d1bbbae13d5396dbb130709e9cdc5f938b
| * Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1Qt Forward Merge Bot2020-02-1566-533/+1589
| |\ | | | | | | | | | Change-Id: Ib26f2a7d33bc1823f13765dda22ef574f4fd55df
| | * Fix license headers in src/scriptKai Koehne2020-02-1266-533/+1589
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LGPL-ONLY header is outdated, and the referenced LICENSE.LGPL file does not exist anymore. Anyhow, the module is documented to be available under Commercial/LGPLv3/GPLv2; that the JavaScriptCore dependency is LGPLv2.1 or later is separate. Fixes: QTBUG-80883 Change-Id: Ic76c127a7643fb90ebd99b6472f84c81a7dc2eee Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-306-10/+10
|\| | | | | | | | | | | Change-Id: I877de1443eb671738a5f4ece19ac49feb4c062f5
| * | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-266-10/+10
| | | | | | | | | | | | | | | | | | | | | It is being deprecated. Change-Id: I772c028967f3c986674081992f569bd7bbba81a5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-121-1/+3
|\| | | | | | | | | | | Change-Id: I494c2ac3ccc3b5673592d5775dd9990d7a0c2f58
| * | Fix crash in QScriptEngine::reportAdditionalMemoryCostLars Knoll2019-10-081-1/+3
| |/ | | | | | | | | | | Fixes: QTBUG-76176 Change-Id: Id48e21b7e2617f34e4ae3e9d09e56641d1d1654a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-10-041-2/+2
|\ \ | |/ |/| | | | | | | | | Conflicts: .qmake.conf Change-Id: I5568b3f8f2834f30e3ffa43f50c2f47ac9b66036
| * Bump Qt version to Qt 6Alexandru Croitor2019-07-111-2/+2
| | | | | | | | | | | | | | | | And also fix usages of removed API. Change-Id: Ifbbe08a202ed19b5969781f66240174ef816269e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devEdward Welbourne2019-07-111-0/+1
|\ \ | |/ |/| | | | | | | | | Conflicts: .qmake.conf Change-Id: I64aacde81bbfde91037b5c4d88c5ac8daba8f5f4
| * Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I92a9d8aba6396ddd77e04450760e03cadbd8c46a Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Don't mention the deprecated qSort in docsSona Kurazyan2019-06-201-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-76491 Change-Id: I19727d181613e945c376d391ade654a2146b7ae4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | QScriptValueIterator: replace a QLinkedList with a std::listMarc Mutz2019-06-061-6/+6
|/ | | | | | | | | | | | The payload type apparently doesn't like to be destroyed unless some magic foo is enabled (cf. ~QScriptValueIteratorPrivate()). Since the code also allows to remove items in the middle, we need a container that guarantees no copies (thus, deletions) happen at all. That leaves a vector<unique_ptr>, or a std::list. Since this is a deprecated module, use the least-intrusive option: std::list Change-Id: Iaadc71959814959bf7ba1a225f375d64edbd9785 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Fix thisObject() of QScriptable argument for String(), etcAlexandra Cherdantseva2019-04-171-1/+1
| | | | | | | | | | When `String(object)` is evaluated, and `object` is a QObject or some custom object with native prototype, then `object.toString()` will be called with incorrect `this`. This also applies for Number(), Boolean() and other built-in constructors. Change-Id: I0219f0e119c1e29d80e4c0f856421352715e9e6e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Make the deprecation notice more visibleMitch Curtis2019-03-273-4/+6
| | | | | | | | Add it to the index page, which is what users see first when they search for the module. Change-Id: I0824306f0ba3ec615e996dbaa834b4f13909b9b9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Android: Use -marm instead of -mthumb for armv7 to avoid a crashAndy Shaw2019-02-261-0/+11
| | | | | | | | | | | | | Since the Android toolchain has problems with using -mthumb for QtScript then we switch it to using -marm instead in order to prevent problems from occurring as a result. Since this is only a problem for the armv7 architecture then we only do this for that architecture. Change-Id: Ia621f066b8336bb12a2ec1aa99e3a9f9afca186d Done-with: Markus Maier <markus.maier.sw@gmail.com> Fixes: QTBUG-67936 Reviewed-by: Markus Maier <markus.maier.sw@gmail.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-042-0/+25
|\ | | | | | | Change-Id: Iccc9e012e446c72292d5c8ef4a45a735a4e88025
| * [android] Fix compile with unified headersBogDan Vatra2018-11-302-0/+25
| | | | | | | | | | | | | | | | Latest Android NDKs are using unified headers which don't have asm/procinfo.h anymore but they provide asm/hwcap.h. Change-Id: Ibd599952d5b22e5e6955958bed33773032ad8a28 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-0/+14
|\| | | | | | | Change-Id: Ieea89c3b8d092df29750074df133480e1b5d95d4
| * Document licensesKai Koehne2018-06-191-0/+14
| | | | | | | | | | Change-Id: Iff237d048ead8e525ef79727fcaabb3043e8db65 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Make more includes bootstrap-compatibleJoerg Bornemann2018-04-192-2/+2
|/ | | | | | | | This amends commit fb7fdcbd. Change-Id: Ic537339ecfdc7054126f6fa280732add73984b12 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Doc: Fix documentation warningsv5.11.0-beta4Topi Reinio2018-04-133-24/+21
| | | | | | | | | | | 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.10' into devLiang Qi2018-01-183-92/+61
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I77f29cac3182808e0b9601f3415c9740b8f0fa88
| * Fix license headersJani Heikkinen2018-01-153-92/+61
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-1822-76/+236
|\| | | | | | | Change-Id: Idebaee1835329337ee03e27e9499b951a5cdb907
| * Fix outdated BSD license headerKai Koehne2017-10-1716-46/+206
| | | | | | | | | | Change-Id: I191edb211ed6cffce17b0a5b7656691ce41b754c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Fix outdated FDL license headerKai Koehne2017-10-176-30/+30
| | | | | | | | | | Change-Id: I8e2e863f4a9f05b577f63a233654785a6d294387 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-273-3/+3
|/ | | | | Change-Id: I9b2a6ce4a0278520fd95042a1b2736cc5a0d4be6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* 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>
* 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>
* Document 3rd party libraryv5.8.0-beta1Kai Koehne2016-10-241-2/+6
| | | | | | | | | 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 superfluous NDEBUG defineJoerg Bornemann2016-07-041-2/+0
| | | | | | | This is already added in WebKit.pri. Change-Id: I6bb2bd9ed20c5cc661847404bc1862314f97a799 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Remove superfluous include pathsJoerg Bornemann2016-07-041-16/+0
| | | | | | | Remove include paths that are already added by JavaScriptCore.pri. Change-Id: I862a806007e8bc6202785a86b014735402830195 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-221-0/+0
| | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I3316ed3782abeca59df16f1aa517c134ecb5fa97 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Make more ctors explicitMarc Mutz2016-03-061-1/+1
| | | | | | | | | | | Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. One is even a protected ctor. Change-Id: I114b26332ba0e2752f5d02ebcd6090fc2b562b40 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-063-5/+5
| | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I7e007ee907c479320a885af329745563c080467d Task-number: QTBUG-45291 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-2/+2
| | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I0cb70c7954b4f23778279d9c6bd8c558b6825d98 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Doc: corrected invalid qdoc \relates statementNico Vertriest2016-01-251-2/+0
| | | | | | Change-Id: I6a73ed6b4eeb241be574f0ddc041f554e120003b Task-number: QTBUG-43810 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-beta1Liang Qi2015-11-171-1/+1
|\ | | | | | | Change-Id: I9eb3f1cd57dd247570b7922ed387d7b72d053558
| * Doc: corrected link to external source5.5Nico Vertriest2015-10-301-1/+1
| | | | | | | | | | | | | | | | Link to manual Javascript available online. Task-number: QTBUG-48258 Change-Id: I5bf2e8af2f1f5d795a47f82ffe553c174726854b Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | doc: Remove uses of \mainclassMartin Smith2015-06-054-5/+0
| | | | | | | | | | | | | | | | This qdoc command is deprecated. Change-Id: I50ebdbfb6d0c445ae4ead0556b9b1b1b0259f860 Task-number: QTBUG-46476 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Use QByteArray::toDouble() instead of qstrtod.Erik Verbruggen2015-02-271-3/+1
|/ | | | | | | No need to use a secretly exported symbol. Change-Id: I3336d57def315e1de1a25dfecbadcaf2459fc039 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-12 14:19:12 +0000