summaryrefslogtreecommitdiff
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>
* Update dependencies on 'v5.15.2' in qt/qtscriptIvan Komissarov2020-12-181-2/+2
| | | | | Change-Id: I4a1b72728b31b2b7a27eddfe621be615635acc16 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-033-3/+3
|\ | | | | | | Change-Id: I37ffab5c5cf7c0898e1fa2b291cb7d95120fa25e
| * Use Qt::SplitBehavior in preference to QString::SplitBehaviorv5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Edward Welbourne2020-03-023-3/+3
| | | | | | | | | | | | | | | | 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 Bot2020-02-080-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: I02db72ae7bd9410b25cec6c6c3db529ff76a8532
| * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib3ee85223340245188b575a7f1ee83f60024e5fc
| | * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | | | | | Change-Id: I9ca719afb1325fd67eea7b86afdbd99a799e19a3
* | | Remove QT_NO_LINKED_LISTSona Kurazyan2020-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | QLinkedList is deprecated and moved to Qt5Compat, there's no need for QT_NO_LINKED_LIST. Change-Id: Idd3fa84a23b62cc878c028ce357ccd3a2fb87de1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-011-0/+20
|\ \ \ | |/ / | | | | | | Change-Id: I4a2dcb9347a0d07246a0070ee982891a82ce2062
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
| |\ \ | | |/ | | | | | | Change-Id: I344b3e84c1cd8fa702a7844cd5812b5f32492842
| | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| | |\ | | | | | | | | | | | | Change-Id: Id0bf41ba81e2e666fa27da1a186b31e751134c04
| | | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-091-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | + 958152b5dabb5fdd370869f49d0d45804b16e399 Add binary compatibility files for qtscript 5.14 branch + 5841084b4fac22343bdea2b41f4ba493dcfad469 Bump version Change-Id: I7408a4492ae466513784aabfbb9778c9ef237976 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-112-4/+4
|\ \ \ | |/ / | | | | | | Change-Id: Ib47f269c82616d5fd300d137471b5878ca983341
| * | Don't use deprecated QMatrix class anymoreJarek Kobus2020-01-102-4/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-46653 Change-Id: I938b17f82bf0eaba7b222fc758e08e6b6eed4748 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-310-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: I772a804e681c9c1b6bab02985aba5cc87262cf04
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I65cd2fcba2496b2d4b20e2990050ebea18c90be7
| | * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | | | | | Change-Id: Iec8b63623a783664d5bf276bdfa86bc289a5b452
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-173-0/+10277
|\ \ \ | |/ / | | | | | | Change-Id: Iec304cc8ec1e0d8f0a7c36b4f6bb721a3ac40035
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-143-0/+10277
| |\ \ | | |/ | | | | | | Change-Id: I96856187418295b7b5ecc0bd9a66aaee650dcef2
| | * Add binary compatibility files for qtscript 5.14 branchMilla Pohjanheimo2019-12-132-0/+10259
| | | | | | | | | | | | | | | | | | | | | BC files built against 5.14.0 added. Change-Id: Ia0452543fd1864b6196f1d88e93457a468928e8c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| | |\ | | | | | | | | | | | | Change-Id: I71405635c337f074ddd3eedc3b3bb3398ba719fb
| | | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Antti Kokko2019-11-251-0/+18
| | |/ | | | | | | | | | | | | Change-Id: I69daed1029d179171c876c74bf519f2b4ef8d345 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-3023-54/+55
|\ \ \ | |/ / | | | | | | Change-Id: I877de1443eb671738a5f4ece19ac49feb4c062f5
| * | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-2623-54/+55
| | | | | | | | | | | | | | | | | | | | | It is being deprecated. Change-Id: I772c028967f3c986674081992f569bd7bbba81a5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-11-251-2/+2
| | | | | | | | | | | | | | | Change-Id: Icef4eefd3524415a85907dae09231ae5a0d7bed9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-11-221-2/+2
| | | | | | | | | | | | | | | Change-Id: Id64f2baafd8f53df5a4226cd7f546f2fecde8b70 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-11-141-2/+2
| | | | | | | | | | | | | | | Change-Id: Id4b5f906e6b51606d8f249fbbcabf5563ea9a6f5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-11-121-2/+2
| | | | | | | | | | | | | | | Change-Id: I89cb46da92f066e3a872b2cf2c5f1e9c591abd95 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-121-0/+20
|\ \ \ | |/ / | | | | | | Change-Id: Iaf6ffba3fa3436cb853617b0991a1f258133b44f
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
| |\ \ | | |/ | | | | | | Change-Id: I3f156e2ca80a76ee578a766bb49ea5dde8fefc17
| | * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5be204b7c11e8622a062fd4518931c825fbe47ac
| | | * Add changes file for Qt 5.13.2v5.13.25.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 590a5ffcb76157f4278e2778135d8d17bc815295 Binary compatibility files for Qt5.13.0 for QtScript + 1701681e4f8ee3b17ca39f563a24065ee43b3a52 Add changes file for Qt 5.12.5 + 16d347e4b31cc6a59d920d91b877f0b721c12a0b Fix build with -no-feature-tooltip Change-Id: Ief19db3774c83f66929219fb2a81bfb499d4ab73 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | | | | | Change-Id: I871015dea9ed922f8ef8711b5ec349a379e89990
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I29ebeea0684b946f4d5767bf10bae3241cf55544 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ife38db9b7eb678e8601204131bc28e49a9571e59 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-11-031-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic2f1deea5b536372f039d3f873ce51d1f4f96e69 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I88eba00a6a5a67dcae8021f4273737504f599799 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-021-1/+1
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ifd68b76216c58e515350c5594c449e81f2922036
View Lorry Controller Status