summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2Qt Forward Merge Bot2019-10-121-0/+2
|\ | | | | | | Change-Id: Ib3471490e7ddb8d7adaf81245d45cd1f8ec178f0
| * Fix build with -no-feature-tooltipJoerg Bornemann2019-10-091-0/+2
| | | | | | | | | | | | Task-number: QTBUG-79048 Change-Id: I287c580785b8b22c877e7a6b885402fbe1bff249 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Remove usages of deprecated APIsSona Kurazyan2019-08-2312-14/+14
| | | | | | | | | | | | | | | | | | Replaced: QLayout::setMargin -> QLayout::setContentsMargins Qt::ItemDataRole::TextColorRole -> Qt::ItemDataRole::ForegroundRole Change-Id: I3bae804d593835f1bc96a8c654fcfa77106bc91c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devEdward Welbourne2019-07-112-0/+2
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I64aacde81bbfde91037b5c4d88c5ac8daba8f5f4
| * Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-092-0/+2
| | | | | | | | | | | | 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>
* | Convert uses of QTime as a timer to QElapsedTimerEdward Welbourne2019-06-122-3/+3
| | | | | | | | | | Change-Id: I19b6f439aa475c32cfe90e67adba93127e476d6e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-202-2/+2
|\ | | | | | | Change-Id: I722db64ed6f5e057f871be1c165c5d1495113f39
| * Fix thisObject() of QScriptable argument for String(), etcAlexandra Cherdantseva2019-04-172-2/+2
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2Qt Forward Merge Bot2019-04-063-4/+6
|\ \ | |/ | | | | Change-Id: I77fe5db7ef582eacbd56488fd60ff8050ed1ae77
| * 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>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-03-041-0/+0
|\ \ | |/ | | | | Change-Id: I3becfe5fb069d07e1be2e8dd1c7c9d8a1b30e950
| * Rename VERSION to VERSION.TXTEskil Abrahamsen Blomfeldt2019-03-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On case-insensitive file systems, this causes an issue with recent versions of the Android NDK, because, since Android NDK r19, the libc++ header "cstddef" contains #include <version> which will resolve to this file instead of the intended header due to the ordering of the search paths. The simplest solution is just to give this a suffix so that it can be differentiated from the headers. Task-number: QTQAINFRA-2568 Change-Id: Ic1502e65de3dba912ed079d406a65ebf9b935694 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-021-0/+11
|\ \ | |/ | | | | Change-Id: Ia5a5e2779cf4afe3a7c5df7a4f16f38e100e785c
| * 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>
* | Doc: Remove unnecessary \fn commandsTopi Reinio2019-02-136-12/+0
| | | | | | | | | | | | | | | | | | These are not required as the documentation is already adjacent to the correct function body. The \fn commands also caused some warnings in the form of clang diagnostic messages. Change-Id: I3fcce59b9e523fc8969dc6ef0440477886da8df7 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Fix some deprecation warningsv5.13.0-alpha1Friedemann Kleint2019-02-061-4/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | | debugging/qscriptedit.cpp:286:39: warning: ‘int QFontMetrics::width(QChar) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] debugging/qscriptedit.cpp:309:48: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] debugging/qscriptedit.cpp:309:48: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] debugging/qscriptedit.cpp:315:49: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] debugging/qscriptedit.cpp:315:49: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] debugging/qscriptedit.cpp:318:45: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] debugging/qscriptedit.cpp:318:45: warning: ‘Background’ is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] tst_qscriptvalue.cpp:1270:45: warning: ‘T qVariantValue(const QVariant&) [with T = QObject*]’ is deprecated [-Wdeprecated-declarations] tst_qscriptenginedebugger.cpp:343:64: warning: ‘T qFindChild(const QObject*, const QString&) [with T = QLineEdit*]’ is deprecated [-Wdeprecated-declarations] tst_qscriptenginedebugger.cpp:345:75: warning: ‘T qFindChild(const QObject*, const QString&) [with T = QPlainTextEdit*]’ is deprecated [-Wdeprecated-declarations] tst_qscriptenginedebugger.cpp:354:88: warning: ‘T qFindChild(const QObject*, const QString&) [with T = QPlainTextEdit*]’ is deprecated [-Wdeprecated-declarations] tst_qscriptenginedebugger.cpp:836:33: warning: ignoring return value of ‘bool QTest::qWaitForWindowExposed(QWidget*, int)’, declared with attribute nodiscard [-Wunused-result] context2d.cpp:473:46: warning: ‘void QPainter::setMatrix(const QMatrix&, bool)’ is deprecated: Use setTransform() instead [-Wdeprecated-declarations] context2d.cpp:486:46: warning: ‘void QPainter::setMatrix(const QMatrix&, bool)’ is deprecated: Use setTransform() instead [-Wdeprecated-declarations] context2d.cpp:500:46: warning: ‘void QPainter::setMatrix(const QMatrix&, bool)’ is deprecated: Use setTransform() instead [-Wdeprecated-declarations] context2d.cpp:627:46: warning: ‘void QPainter::setMatrix(const QMatrix&, bool)’ is deprecated: Use setTransform() instead [-Wdeprecated-declarations] tetrixboard.cpp:104:76: warning: ‘const QBrush& QPalette::background() const’ is deprecated: Use QPalette::window() instead [-Wdeprecated-declarations] tetrixboard.cpp:130:33: warning: ‘QColor QColor::light(int) const’ is deprecated: Use QColor::lighter() instead [-Wdeprecated-declarations] tetrixboard.cpp:134:32: warning: ‘QColor QColor::dark(int) const’ is deprecated: Use QColor::darker() instead [-Wdeprecated-declarations] Change-Id: I795c140c476541bba9c653effdcda0a50cbe9acd Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* Fix build with GCC 8.3Thiago Macieira2019-01-281-24/+24
| | | | | | | | | Qualifiers in the asm statement are not allowed in the global scope. I thought they were necessary for LTO, but I the commit to this file that added them predates my work on setting up LTO for GCC. Change-Id: Id98140e1c2f0426cabbefffd157e23e5ece67a49 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Enable JavaScriptCore to compile for MSVC arm64Thomas Miller2018-12-212-2/+2
| | | | | | Change-Id: I2a735a5bfa8eb417cb2824ebd8e008676f403e35 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-043-1/+26
|\ | | | | | | Change-Id: Iccc9e012e446c72292d5c8ef4a45a735a4e88025
| * [android] Fix compile with unified headersBogDan Vatra2018-11-303-1/+26
| | | | | | | | | | | | | | | | 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>
* | 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>
* | 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>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-232-0/+23
|\ \ | |/ | | | | Change-Id: Ieea89c3b8d092df29750074df133480e1b5d95d4
| * 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' 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>
* | 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.10' into devLiang Qi2018-01-18147-2108/+2941
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I77f29cac3182808e0b9601f3415c9740b8f0fa88
| * Fix license headersJani Heikkinen2018-01-15147-2108/+2941
| | | | | | | | | | | | | | | | | | | | 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-1830-166/+298
|\ \ | |/ | | | | Change-Id: Idebaee1835329337ee03e27e9499b951a5cdb907
| * Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3Liang Qi2017-10-1828-98/+298
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf qtscript.pro Change-Id: If0f8875c8af2afb717ba394fac4e506076f01517
| | * Fix outdated BSD license headerKai Koehne2017-10-1720-58/+258
| | | | | | | | | | | | | | | Change-Id: I191edb211ed6cffce17b0a5b7656691ce41b754c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Fix outdated FDL license headerKai Koehne2017-10-178-40/+40
| | | | | | | | | | | | | | | Change-Id: I8e2e863f4a9f05b577f63a233654785a6d294387 Reviewed-by: Jani Heikkinen <jani.heikkinen@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>
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-274-6/+6
|/ | | | | 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>
* 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>
* 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.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>
* | 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>
* | 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>
View Lorry Controller Status