summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.05.13.0Antti Kokko2019-05-071-0/+18
| | | | | Change-Id: I1e5af910ca2884994985e791bf8ee124d90ece95 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-205-3/+68
|\ | | | | | | Change-Id: I722db64ed6f5e057f871be1c165c5d1495113f39
| * Fix thisObject() of QScriptable argument for String(), etcAlexandra Cherdantseva2019-04-174-3/+48
| | | | | | | | | | | | | | | | | | | | 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.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
| |\ | | | | | | | | | Change-Id: Ia9c6d912749e3e2fb5e989970f09b3ce148a4a46
| | * Add changes file for Qt 5.12.3v5.12.35.12.3Antti Kokko2019-04-021-0/+20
| |/ | | | | | | | | | | | | | | | | | | + 4749a3ec61859e324f14add3008c41f92e6c2793 Android: Use -marm instead of -mthumb for armv7 to avoid a crash + a122caecff790a82f707894fa9db72afe91fcb7e Rename VERSION to VERSION.TXT + 6522303cb94a9ba5583d68f8c68e4fadf3fb6d7b Bump version + 2379c9b93792feb97d6cb871082aed0f7cbcbad8 Make the deprecation notice more visible Change-Id: I6d5b01283720be2b39fe5e7b1ca1fb0554c91239 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | 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.13Qt Forward Merge Bot2019-03-270-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4b1096a64888e84670a74943851600888abbd998
| * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | Change-Id: Ib5a10645acf3f265420731b508757f4b85a502a4
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
|\ \ | |/ | | | | Change-Id: If8c1ef9e2d9b5d580d74aa648e16b9106d5bc9ba
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
| |\ | | | | | | | | | Change-Id: I882638bff51f39cd09e9a95b9c74f9efb874eeab
| | * Add changes file for Qt 5.12.2v5.12.25.12.2Antti Kokko2019-02-251-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | + 66f1a94aead9c9b3dacbf91ef763edcda217e56e Bump version + 97ec1d1882a83c23c91f0f7daea48e05858d8c32 Fix build with GCC 8.3 Change-Id: Ia823012bdedff4b1a41079a08806e0db96777fcd Reviewed-by: Jani Heikkinen <jani.heikkinen@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-065-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-022-24/+44
|\ \ | |/ | | | | Change-Id: I99968ef89b2494301e7359af09c5f232e51e7438
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+20
| |\ | | | | | | | | | Change-Id: Ie8b50860bd0ecad55b1ae8d2830e6732a58ad5d9
| | * Add changes file for Qt 5.12.1v5.12.15.12.1Antti Kokko2019-01-091-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + ebe11c8e867bb65ad7cb1424fe4c096935741089 Bump version + cf09bc7285793d81a9755bf7e807c9d51d47d980 Add changes file for Qt 5.11.3 + 3e1692bebdf2e4c69adb2a23718ad230a74992dd [android] Fix compile with unified headers + b65a9693f730f625cda95684acfaefd21538a5da Enable JavaScriptCore to compile for MSVC arm64 + 520fb9177a3e86cb7c27b752e5a4c3798dc4b4f9 Bump version Change-Id: I32119acaa6c2e024e93ab5b559dc051a493d34c9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | 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>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie657c3cef2b06d04f1b744fffdd9c550b57bfe69
| * | Bump versionKari Oikarinen2019-01-141-1/+1
| |/ | | | | | | Change-Id: I13fe2b7e71701accf3a76f0761777e08e72ff6bf
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib6d9c61dca6ef1f452adec9e7764dc0622aadf08
| * Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: I88ea4d6cc6c172dd492c8004682db7ecfbcf1f29
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-252-2/+2
|\ \ | |/ | | | | Change-Id: I5b83e1baec75279396171433aedf4b94267e805f
| * 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.12' into devQt Forward Merge Bot2018-12-151-0/+20
|\ \ | |/ | | | | Change-Id: Ibcd516f81377f9878ceac59cccc6a77a8a219ca8
| * Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
| |\ | | | | | | | | | Change-Id: Idb3d2791412fabeae0f115030fb416f608de2404
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I86136b2066da64b74892f1a99dda108b87cbe2ff
| | | * Add changes file for Qt 5.11.3v5.11.35.11.3Antti Kokko2018-11-161-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | + ebe11c8e867bb65ad7cb1424fe4c096935741089 Bump version Change-Id: I7461df0b80fd23f1df52f5229357aea78f94cf14 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-085-1/+49
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I81a3361580e025ea2a5984d2e7c552de96cbcf87
| * | | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+18
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I80ab7405ff9dc2e57606e5f9a8dd8f436d382449
| | * | | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.05.12.0Antti Kokko2018-11-121-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9a6cca0ad2e7d7e2c538ea707061b7774b8ed0e0 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-044-1/+31
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: Iccc9e012e446c72292d5c8ef4a45a735a4e88025
| | * | | [android] Fix compile with unified headersBogDan Vatra2018-11-304-1/+31
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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.12' into devQt Forward Merge Bot2018-11-170-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ia12b58e1d70fc503f14ad3b14242c54a7ba5ede6
| * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | | | | Conflicts: .qmake.conf Change-Id: I8e35e2a263c2b595bdb1c3298ef63dd33308eacc
| | * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | Change-Id: I3f07c620b26caa78b90954061f3de91fb23f5f35
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-162-7/+14
|\ \ \ | |/ / | | | | | | Change-Id: I0098fde03c223474fff97ba794f06318fd9b3e04
| * | 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>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: I841f88924839d16e6f3cd59dd7f6365731d3f352
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-151-0/+24
|\ \ \ | |/ / | | | | | | Change-Id: I7ed138a8c87680d9c07a492e3bd03b709da8633f
| * | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta2v5.12.0-beta1v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
| |\ \ |/ / / | | _ | | Change-Id: I55333f0c79e50e48f0bc87277610766d13e3f1ba
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: I4607bb687882aeee262840f209a5047b6a2d211d
| | * Add changes file for Qt 5.11.2v5.11.25.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: I506d187978c501c5034fc5e33471020d1ad43e1d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I94fcf57af10329d571ccb9e413ec00f449bbd551
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: I9a3a459a2526fd28181e7504a1e2cae8daf9dce2
* | 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>
View Lorry Controller Status