summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.15.1HEADdevAntti Kokko2020-08-251-0/+20
| | | | | | | | | + fe5eb952c4811adfee9ef7e37463039d879774ff Bump version Change-Id: I0393073328499d305f7ab1c35a0886749189d06f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 09801264493e1b2ceb4918be59a13dde1a24d882) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing overrideAlexander Volkov2020-06-2936-201/+201
| | | | | Change-Id: I20cec71db97cbf896255d4f6d7e947072a86e2bb Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-2623-103/+103
| | | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I66f620431011d02cb1542e8ad613dadd28fdd843 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-2568-277/+260
| | | | | | | Task-number: QTBUG-84469 Change-Id: I4dc064b70adb054ca4add2dd662e7227255ff970 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: Id0b05f32ccb145b58c04d4f6db69caba8f17c733
| * Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
| |\ | | | | | | | | | Change-Id: I393d29005bbff24389a2558cad1ad67dbdde0ca8
| | * Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Qt Forward Merge Bot2020-04-221-0/+20
| | |\ | | |/ | |/| | | | Change-Id: Id46db73bd6d94dc879657086663594436bd36c7c
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + a54a5a253fce25d0ffa215996a3cdf2fca8b06bc Bump version + 309066052eec6cafa8ef7ac5d165fe328ef0e509 Avoid initializing QFlags with 0 or nullptr + a315402ab232e3e4398f0b1c1d6910bdcefaec4f abstractdeclarative.cpp: Fix deprecation warnings + ebb48fa6be3aeae6915da7ec30311a0e439a0720 Fix deprecation warnings + 407bee91eb83b6ff2df6e5d99366971bf21e2637 Use Qt::SplitBehavior in preference to QString::SplitBehavior Change-Id: Icff9f191797dd8d615765f3b8bc38fdc938ac237 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-251-0/+20
|\ \ \ | |/ / | | | | | | Change-Id: I3e803c50d446bab023d3f03897cea76086bb1fe3
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | |/ | |/| | | | Change-Id: Ic8fe0e6ff9f0ee51615a9b1582f6d48df6907f68
| | * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| | |\ | | | | | | | | | | | | Change-Id: Idec69f0f9a6dc4f57e7e8d040f5658601e053bea
| | | * Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-101-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | + 0b6024b853da4122a427d1edd1e009d175b1b80a Doc: Fix typo in qdoc command + b255d8923ba5eb8435485c1fab3f8d563ac4837c Bump version Change-Id: I5af5cb807ea65de14434c8f31c73f34a578c07ea Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Remove QT_NO_LINKED_LISTSona Kurazyan2020-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | QLinkedList is deprecated and moved to Qt5Compat, there's no need for QT_NO_LINKED_LIST. Change-Id: I9174a19c385eed9e14cc4acfb5416616abbf5fef Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2020-03-267-6/+29
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-247-6/+29
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I9152493c8aed299f0bcffc03651b05d6ae01db22
| | * | Use Qt::SplitBehavior in preference to QString::SplitBehaviorv5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Edward Welbourne2020-03-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Iee6bd8e83592c26b63259959e58d52131921438f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1Qt Forward Merge Bot2020-02-180-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If0a9a36e4d9fe5151014dded02559ce60f2eae32
| | | * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: I9794d24e2f1ce6b04da675acdcabcd66deccd132
| | * | Fix deprecation warningsFriedemann Kleint2020-02-173-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | colorgradient.cpp:80:61: warning: ‘QQmlListProperty<T>::QQmlListProperty(QObject*, QList<T*>&) [with T = QtDataVisualization::ColorGradientStop]’ is deprecated: Use constructor taking QList pointer, and gain improved performance [-Wdeprecated-declarations] declarativerendernode.cpp:116:71: warning: ‘QSGTexture* QQuickWindow::createTextureFromId(uint, const QSize&, QQuickWindow::CreateTextureOptions) const’ is deprecated: Use createTextureFromNativeObject() instead [-Wdeprecated-declarations] customformatter.cpp:167:34: warning: ‘QDateTime::QDateTime(const QDate&)’ is deprecated: Use QDate::startOfDay() [-Wdeprecated-declarations] Change-Id: Iaf3b8814cd70a704b87b4970ad83ed5a7d4dc0f1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-01-282-1/+21
| | |\ \ | | | |/ | | | | | | | | Change-Id: Ie1823c477a005d44d7b12d1e6d9228d89b619298
| | | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| | | |\ | | | | | | | | | | | | | | | Change-Id: I366104c6fc4c8097326241662592e53da6251a3a
| | | | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-101-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 86efcb0bea7a9df8aa8be2c836e1a2f7da25fd3a Bump version Change-Id: I67a2381681fdc5378235510a60038df3789b6355 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * | Doc: Fix typo in qdoc commandPaul Wicking2020-01-271-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-81676 Change-Id: Ibe7f73e1fc529411ca92d7bdbb2ad8824cb97a62 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | | Update dependenciesFriedemann Kleint2020-03-2612-10/+19
|/ / / | | | | | | | | | | | | | | | | | | Add missing Q_MOC_INCLUDE and adapt to OpenGL split. Change-Id: I6150876a62ca55ad63c09a128226c2bac428b821 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-071-2/+2
|\ \ \ | |/ / | | | | | | Change-Id: Ia189ad6a24e3284a538cea1f78fcbc9b4687f6b8
| * | abstractdeclarative.cpp: Fix deprecation warningsFriedemann Kleint2020-01-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QHash::contains() instead of checking for presence via value(), fixing: abstractdeclarative.cpp:681:48: warning: 'QList<ValueType> QHash<K, V>::values(const Key&) const [with Key = QQuickWindow*; T = bool]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations] abstractdeclarative.cpp:694:45: warning: 'QList<ValueType> QHash<K, V>::values(const Key&) const [with Key = QQuickWindow*; T = bool]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations] Change-Id: Ic858949514a647f62e74bff6ece346851dce413b Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-310-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: Ibe0aae25bf91001c915b3f14f072d0a9888e0f8a
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If5cf8cef472f062899993c6bd69018df1953c5bb
| | * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | | | | | Change-Id: I1b5fa87d115b2e3f74392d373841a6349bd0ce69
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-171-0/+18
|\ \ \ | |/ / | | | | | | Change-Id: Id462569181a90c692b28f49acef1f3f5476fde37
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
| |\ \ | | |/ | | | | | | Change-Id: If81fffe1cbdb10b14fc762fdb9c6634680ba75b5
| | * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| | |\ | | | | | | | | | | | | Change-Id: Ie62ba04e425b7ebf5cfe48f0addac351788f23e6
| | | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Antti Kokko2019-11-261-0/+18
| | |/ | | | | | | | | | | | | Change-Id: I133417c323b961271be94ca5672c17295989a446 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-12-051-3/+3
| | | | | | | | | | | | | | | Change-Id: I4e86bc5a1048521fd4b68133b774db48e12979c2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-12-041-3/+3
| | | | | | | | | | | | | | | Change-Id: I0756ecb2bc712b77530c0183b25ab0b3fa581c9a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-11-302-15/+8
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-302-15/+8
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I8bfa9b1604d35abc2844c0a4e10c0f8c66cc2acd
| | * | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-262-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is being deprecated. Change-Id: I38e6bc29ac03108f56f445069b2dbbe8a3db201a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-291-3/+3
|/ / / | | | | | | | | | | | | Change-Id: Ib8e0fe2417543d712daf74eced57bf04d7042290 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-281-3/+3
| | | | | | | | | | | | | | | Change-Id: I169ba9480bbc54b069e2f3492ee813b44508e8a5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-261-3/+3
| | | | | | | | | | | | | | | Change-Id: I93885697578e4c377cba915d549f25c34aad1d41 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-251-3/+3
| | | | | | | | | | | | | | | Change-Id: I872642f24917856cefb97b80e01c838c590f781e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-221-3/+3
| | | | | | | | | | | | | | | Change-Id: I5e4a066de71420f25e26bf00267da3d0bcd9d7a5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-141-3/+3
| | | | | | | | | | | | | | | Change-Id: Ia8233bfc975abd56f579f58d9d6df909ea8015b4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-121-3/+3
| | | | | | | | | | | | | | | Change-Id: I2e0ceebf98dd740a95e525e745d722882bbf4ba9 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: I9b969eee802e8e0288c07fe138fd45f550ba787b
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
| |\ \ | | |/ | | | | | | Change-Id: Ib7ba82cc6f1a30e8f026cea8da5b36d8201db7de
| | * 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: I9404bf15dd2321957603feb1a605f7b50724cbe3
| | | * Add changes file for Qt 5.13.2v5.13.25.13.25.13Antti Kokko2019-10-151-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + b0114f0dcba2d1709aac47530febc51e5078593e Fix GCC 4.8 build of abstract3drenderer + 3858190b2b2e71a7b63e9976da2b22f1c342e3b3 Add changes file for Qt 5.12.5 Change-Id: I9f7ee8e553b55d87a4695f71af7411aa1bcbfaef Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| | | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | | | | | Change-Id: I01244127c6025b18b32ce40648f4d1de4a5fc0ff