summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Suppress sanitizer for Heap::markConservativelyHEADdevIvan Komissarov2021-10-261-0/+7
| | | | | | | | This function does delibarately corrupt the stack when called from markCurrentThreadConservativelyInternal(). Change-Id: I63504c9bc1b892f9bb236de92bf363b82aebd420 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* 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>
* Fix build in C++17 modeIvan Komissarov2020-12-188-17/+13
| | | | | | | | Replaces auto-ptrs with unique_ptrs and fixes the ceil() macro which confilcts with some other code in Qt6 headers. Change-Id: I59e45fae84878d1fa0cf59383f0eb7763f1ecc68 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-031-1/+1
|\ | | | | | | Change-Id: I37ffab5c5cf7c0898e1fa2b291cb7d95120fa25e
| * Use Qt::SplitBehavior in preference to QString::SplitBehaviorv5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Edward Welbourne2020-03-021-1/+1
| | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: I10d928ac4368e07a52a92ef92bf501ba28d9b667 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | 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-3020-25/+25
|\ \ \ | |/ / | | | | | | Change-Id: I877de1443eb671738a5f4ece19ac49feb4c062f5
| * | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-2620-25/+25
| | | | | | | | | | | | | | | | | | | | | 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-191-0/+2
|\ \ \ | |/ / | | | | | | Change-Id: Ie112fce6a13098f0baee5f06d4dbeafb0daca2e1
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-151-0/+2
| |\ \ | | |/ | | | | | | Change-Id: Ibbbb491c8a532376eae3879ac3a545180e1728ff
| | * 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>
* | | | 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-045-9/+12
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5568b3f8f2834f30e3ffa43f50c2f47ac9b66036
| * | Bump Qt version to Qt 6Alexandru Croitor2019-07-115-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | 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
View Lorry Controller Status