summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.0Qt Forward Merge Bot2020-04-221-0/+20
|\ | | | | | | Change-Id: Id46db73bd6d94dc879657086663594436bd36c7c
| * 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.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>
* | / 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>
* | 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.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>
* | 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.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.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.0Antti Kokko2019-11-261-0/+18
| |/ | | | | | | | | Change-Id: I133417c323b961271be94ca5672c17295989a446 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | 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>
* | 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.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
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-011-1/+277
|\| | | | | | | | | | | Change-Id: Ib04f91529d95b1268bfd470fa88e00dce866121a
| * | Update plugins.qmltypes for 5.14v5.14.0-beta2v5.14.0-beta1Kai Koehne2019-09-301-1/+277
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: Ib264cb0294f02e2983cba0041a48ff87b7bc4f51 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-212-0/+40
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-212-0/+40
|/| | | | |/ / | | | | | | Change-Id: I65642f3568bcb7873893beb85cb88a7f07a2eed7
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-alpha1Qt Forward Merge Bot2019-09-172-0/+40
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+40
| |/| | | | |/ | | | | | | Change-Id: I33d39a00a4628baeda098ce5e8665307617ad789
| | * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
| | |\
| | | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| | |/| | | | | | | | | | | | | Change-Id: Ia2b7db2f249f6606629a2df3a242176f97559417
| | | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | | |/| | | | | | | | | | | | | | | | Change-Id: I7c34d832f81f7f96ea7d3fe56a25722a3a161d4a
| | | | * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-231-0/+20
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | + 54a0844f5c9c8ec54fcd740b8b99b05fe4532818 Bump version Change-Id: I7ae9ff4d484931d90fe4d7fc5c7998dd71e69dab Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| | |/| | | | | | | | | | | | | | | | | Change-Id: I337c17410cc8f3d69a3817c052c14cb284824317
| | | * | Add changes file for Qt 5.13.1v5.13.1Antti Kokko2019-07-301-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 18c303dc1ed3e8cd8577e93c5223417e320e068d Bump version + 41d93443ab264b4a0869290929e2de84b4a3c494 Add changes file for Qt 5.12.4 + 10fbcc8ea7a2a7c2d3f72738413f3a67a7a486ad Bump version + 54a0844f5c9c8ec54fcd740b8b99b05fe4532818 Bump version + 66d9e04f79e72e6f58c33eadebb1e40c039c14d6 Doc: Replace example file lists with links to code.qt.io Change-Id: Ifc82b0acb8e100fc3c1a7bb3723560a3725dffd9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | | Merge "Merge dev into 5.14 (delayed final downmerge)"Kari Oikarinen2019-09-042-2/+2
| |\ \ \ \
| | * | | | Merge dev into 5.14 (delayed final downmerge)Kari Oikarinen2019-09-042-2/+2
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replicates the effects of the fast-forward merge that should have been pushed on 2019-08-27 as the final down-merge from dev to 5.14. Task-number: QTBUG-78019 Change-Id: I9e1685238ec1d8450c8d0a5e8894f4d38407dd54
| * | | | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-08-281-1/+1
| |\ \ \ \ \
| | * | | | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-08-281-1/+1
| |/| | | | | | | | |/ / / | | |/| | | | | | | | | Change-Id: Ibfe56eccd7435d995db91964e2352f19a4272d56
* | | | | | Bump versionKari Oikarinen2019-08-271-1/+1
| |_|/ / / |/| | | | | | | | | | | | | | Change-Id: Icf111f789a66ec18b56d4e142d6fa8ac5d233545
* | | | | Replace the deprecated QWheelEvent::delta() -> QWheelEvent::angleDelta()Sona Kurazyan2019-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced the deprecated QWheelEvent::delta() with the vertical component of angle delta, assuming that it's acceptable to have a single-dimension mouse wheel in the example code. Task-number: QTBUG-76491 Change-Id: Ie05bb5934ce43976cd3cf009343d7b50ea327f14 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-08-241-1/+1
|\ \ \ \ \
| * | | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-241-1/+1
|/| | | | | | | |/ / / | |/| | | | | | | | Change-Id: I08c9b0b57ccefc161815833ccd63208d2768cb54
| * | | | Fix GCC 4.8 build of abstract3drendererVille Voutilainen2019-08-221-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | Task-number: QTBUG-77730 Change-Id: I827d727b103a9923a8b82163bfa4f77c81c0906b Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Remove the usage of deprecated QWheelEvent::posSona Kurazyan2019-08-231-1/+1
| |/ / |/| | | | | | | | | | | | | | Task-number: QTBUG-76491 Change-Id: I5831525f8ac4bf0cbec6a52a434b1d8c3b388b80 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-161-0/+1
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-161-0/+1
|/| | | | |/ / | | | | | | Change-Id: I9d75a47adea2d20db06f66ffa844275cbcf928d3
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 07:35:07 +0000