summaryrefslogtreecommitdiff
path: root/src/script
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Fix BSD license headerSergio Ahumada2015-02-191-2/+2
| | | | | Change-Id: Id8f996f28618845a8b253f5162bec7df98921ef0 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Fixed license headersJani Heikkinen2015-02-1715-45/+45
| | | | | Change-Id: I99e62a707fe649403214436a4b9aad8fd82015ee Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-135-4/+75
|\ | | | | | | Change-Id: Ic32f5bd17782285305aaa01694f1a78851b882eb
| * Doc: Moved the example documentation to correct locationsNico Vertriest2015-01-195-4/+75
| | | | | | | | | | | | | | | | | | | | And fix the \snippet commands to use the correct paths. Also edited dependencies qdocconf files Task-number: QTBUG-43810 Change-Id: I3c2fb6d2a48900a9b5651225381707c9ec25065a Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Update copyright headersJani Heikkinen2015-02-1289-433/+417
|/ | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Iffc10aac2cdaf7c7ceba051ec447f15758c3d8e0 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Fix C++11 build of qtscriptAllan Sandfeld Jensen2014-09-261-6/+0
| | | | | | Change-Id: I168347f42b61ff00574f7ccf59cd24f044ea64f7 Task-number: QTBUG-41361 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Don't disable C++11 on OS X and iOSMorten Johan Sørvig2014-09-201-2/+4
| | | | | | | | | | | | | On OS X and iOS, enabling C++11 has the side effect of switching the standard library from libstdc++ to libc++. Qt 5.2 enables C++11 by default, which leads to a Qt build that uses both standard libraries. This is something we would like to avoid. As with clang it is possible to build webkit also with C++11 instead of forcing the use of libc++ also without C++11 we simply build with C++11 on OS X and iOS. Change-Id: I0ad8fb550ef79ac37ac97a75799ac38aa19d39d4 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Update license headers and add new license filesAntti Kokko2014-08-242-37/+21
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I8b229a6405aefe7951ad0d13d6432d01a4ec8263 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
| | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I6a09e5862558629338da4bc8332e532d77de7d49 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Fix recursive calling of QScriptProgramv5.3.0-rc1v5.3.0-beta1v5.3.0release5.3.0Lars Knoll2014-03-111-1/+1
| | | | | | | | | | | | The first time a QScriptProgram is evaluated, it gets compiled and then executed. If the execution would somehow trigger another evaluation of the script program, it would run into the compile stage again (even though it already was compiled), and then trigger and assertion in debug mode (or leak memory in release builds). Task-number: QTBUG-37317 Change-Id: I83e7efd5f238d021e200258826e2e4a9520c3a7d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-0/+1
| | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I77ed98ade58cdd4c6f5c365682993f1be3f3e958 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* use private linkage where possibleOswald Buddenhagen2013-11-011-1/+1
| | | | | Change-Id: I3c0a1ae83615120f9a0cf8202d4facf915decde2 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* WS fix in qscriptcontext.cppv5.2.0-beta1Jerome Pasion2013-10-081-1/+1
| | | | | | | -produced by git-split-ws Change-Id: I1661678174c62971a7bbf4acb2890fdf590d2f3d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Adding "\inmodule QtScript" to Qt Script classes.Jerome Pasion2013-10-0812-9/+13
| | | | | | | | -reduces QDoc warnings -lists the classes in the C++ pages Change-Id: I97db6b8bec4d44d1ee37ed2925ef7309cd0d420f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Remove QtAlgorithms usage from QtScript.Friedemann Kleint2013-09-261-2/+3
| | | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: If4dc8f69fd75315390a4850be732715064f5fdd8 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-061-0/+2
|\ | | | | | | Change-Id: I8352e99c9886882115b5808e6903ce09645949ba
| * exclude WebKit/JavaScriptCore from lupdate scanOswald Buddenhagen2013-09-021-0/+2
| | | | | | | | | | | | | | | | there is no point in scanning it, and it's incredibly slow. Change-Id: Ife2fe879b8285f18bb714804c532a68ed64f84d8 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | QtScript: Fix header guardTobias Hunger2013-08-291-1/+1
| | | | | | | | | | Change-Id: Ib8db978f3f5414fccfcf772f7fa9b2b7ddbc761c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Doc: Setting \qtvariable in module page.Jerome Pasion2013-08-021-1/+1
| | | | | | | | | | | | | | \qtvariable indicates the QT variable needed in .pro files. Change-Id: I018b00a19c3bbd2aa4bf34712f414569dd50775b Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-112-10/+0
|\ \ | |/ | | | | Change-Id: I4231685b78a7886928efe191aa7f09bb8a50e81e
| * Remove references to obsolete QSA-product.Friedemann Kleint2013-07-112-10/+0
| | | | | | | | | | Change-Id: I2a89644fa7440b0ef113d956affd745716607aee Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: Setting navigation variables for Qt Script and Qt Script ToolsJerome Pasion2013-06-261-1/+4
|/ | | | | | | -also enabled linking to 'qtdoc' for the homepage link Change-Id: I74781effabac4c73c8a286347e5aa0821d5931f0 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Removed landing page from "technology-apis" group.Jerome Pasion2013-05-241-1/+0
| | | | | | | The group in qtdoc was replaced by the new overviews in qtdoc. Change-Id: I55518f8cf581a4de394863e359a3a848fc9842b0 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Doc: Fix module names in .qdocconfTopi Reinio2013-04-261-11/+11
| | | | | | | | | Use CamelCase for module name(s) used in in .qdocconf - this is required as qdoc will generate visible output (tags in example manifest files) based on these names. Change-Id: If9f79e73d823270d8ecb652d1b7b9d9d44f9562e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
View Lorry Controller Status