summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix Qt6 buildwip/qt6Alexandru Croitor2019-08-013-8/+8
| | | | | Change-Id: I1ee69b3c834c159b994f9a83f7ef36e650b09451 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Bump Qt version to Qt 6Alexandru Croitor2019-07-116-10/+13
| | | | | | | | 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>
* Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-291-0/+20
|\
| * Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-291-0/+20
| |\ |/ / | | | | Change-Id: I969b8b9e4402eb3b0a75580ebc52b3951343d42d
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+20
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+20
| | |\ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9b5d1f08da050c04b3d54e50a19bc5728281ebe6
| | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | | |\ | | |/ / | | | | | | | | Change-Id: I90598c490c543edcaa6d6e78b9703627768aee80
| | | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: Iccca090d9947b7a71b0afdaa072a771b4d94417a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | |/ | | | | | | | | | Change-Id: If962a1d44f5edf08d31e513fd983f89c5c5ee793
* | | Remove usages of qVariantFromValueSona Kurazyan2019-06-285-44/+44
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-76491 Change-Id: Iabb97fe7cb168a421b690bc71e826e1b90b955f9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | | Remove usages of deprecated APIs from QDateTimeSona Kurazyan2019-06-272-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced the deprecated QDateTime::toTime_t() with QDateTime::toSecsSinceEpoch(). Task-number: QTBUG-76491 Change-Id: If5ae11025e083f37b1d5c4b10d45de735ec0f84c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-221-0/+18
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-221-0/+18
| |\ \ \ |/ / / / | | _ / | | / Change-Id: Id14122c9b7c3d78199c0da0b04dbd96ce54f32fe
| * | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+18
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+18
| | |\ \ | |/ / / | | | | | | | | Change-Id: I79141d8a04a1e7eb94d553d4f1c26423a9a56557
| | * | 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>
* | | 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>
* | | tst_QScriptEngine: replace QLinkedList with std::listMarc Mutz2019-06-111-10/+9
| | | | | | | | | | | | | | | | | | | | | QLinkedList is going to be deprecated. Change-Id: Id31883f3d491534679d08044671e7d29d6794ba5 Reviewed-by: Lars Knoll <lars.knoll@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.13' into devQt Forward Merge Bot2019-04-235-3/+68
|\ \ \ | |/ / | | | | | | Change-Id: Ib0c08186ea28decda3b39baeb323a0c84bdb259e
| * | 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>
* | | Remove a qsrand() call that's now redundantEdward Welbourne2019-04-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | The Tetris example uses Math.random(), which is now implemented using QRandomGenerator::global(), making the call to qsrand() pointless. Change-Id: I5cce3271076b8202a20a5d944b037e92f487f17f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Use QDateTime::fromMSecsSinceEpoch(0) to get the epochEdward Welbourne2019-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ... rather than hand-constructing it. This saves constructing two intermediate objects and gets the same result. Change-Id: Iaeadb92263b063c4c96c8d8ca151d7a2d99aa5e5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-093-4/+6
|\ \ \ | |/ / | | | | | | Change-Id: I47e91495d6da245132e7bf2bf836d81b95349f51
| * | 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.13' into devQt Forward Merge Bot2019-03-300-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: I40d2eaef67c1f894ac81101e30a9f2bf77a702f1
| * | 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.13' into devQt Forward Merge Bot2019-03-191-0/+20
|\ \ \ | |/ / | | | | | | Change-Id: I6d91163f8cbc51d23e87f9e7b5bc3c353baa073f
| * | 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.13' into devQt Forward Merge Bot2019-03-052-0/+11
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I287ae9b4d3697d31383294800bf471fc3f4ee759
| * | | 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>
* | | Bump versionKari Oikarinen2019-02-251-1/+1
| | | | | | | | | | | | Change-Id: Idf018a3ec5e9c839d7e03ec7855c485e551ee531
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-196-12/+0
|\ \ \ | |/ / | | | | | | Change-Id: I3f44bdfa576789fea2b931205835bd42cd798f8a
| * | 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>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-125-15/+15
|\ \ \ | |/ / | | | | | | Change-Id: I4f4fee1eed9127999829d0bf3cb6fdb03a2ece48
| * | 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.13' into devQt Forward Merge Bot2019-02-052-24/+44
|\ \ \ | |/ / | | | | | | Change-Id: I009a1024f264d9baedded8f512470487bdff5282
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-022-24/+44
| |\ \ |/ / / | | _ | | Change-Id: I99968ef89b2494301e7359af09c5f232e51e7438
View Lorry Controller Status