summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Disable tst_qmltest on QEMUv6.1.0-beta1Tomi Korpipaa2021-02-251-0/+4
| | | | | | | | | QEMU does not have support for createPlatformOpenGLContext, which is required for the QML applications to work. Fixes: QTBUG-91381 Change-Id: Ie14c6306c3aa952e6e71681c17013586d0dfb592 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1' in qt/qtdatavis3dJani Heikkinen2021-02-251-3/+3
| | | | | Change-Id: Ic12ed5ceb4d7da412540d6612d79222798c1a17d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1' in qt/qtdatavis3d/Jani Heikkinen2021-02-221-2/+2
| | | | | Change-Id: If458b6f9282f78770cce9c129a2f1ce5f0a7e131 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1' in qt/qtdatavis3d/Jani Heikkinen2021-02-221-3/+3
| | | | | Change-Id: I9e06483fb9ddb2e7eb04686b19416fa8e8d9563d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* conanfile.py: Use QTDIR instead of QT_PATHIikka Eklund2021-02-151-4/+4
| | | | | | | | | | | | | | | There's an established environment variable for this though, QTDIR. This environment variable is also set by Qt Creator by default. So the Conan recipes should accept this environment variable instead. This requires a change in the matching conan profile files where the path to Qt installation is injected to env. Task-number: QTBUG-90583 Change-Id: I128cc1390f0a8525ee4490393cb63338bf511c16 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 64dada44e1cd0f15da0cc12105aebe83210cbdfe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Conan: Use the 'shared' option value of the Qt buildIikka Eklund2021-02-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to the value of the prebuilt Qt build. The 'default' needs to be added as valid option in the list which will be used by default if no value is given by the user or via the conan profile. The user is still able to override this via the profile or from command line if needed: "conan install ... -o shared=False" CMakeCache.txt: - "conan install ..." - BUILD_SHARED_LIBS:BOOL=ON - "conan install ... -o shared=True" - BUILD_SHARED_LIBS:BOOL=ON - "conan install ... -o shared=False" - BUILD_SHARED_LIBS:BOOL=OFF Task-number: QTBUG-90901 Change-Id: I59db7a92cfe8f37bdf0f2f4df9408386aacfac82 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit fe9b50df1545216c08aba0443988d3e3130da62b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdatavis3d/v6.1.0-alpha1Jani Heikkinen2021-02-121-3/+3
| | | | | Change-Id: I7afc1102af7e3cc12d8f909c4bcae0e5f4fa501b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump version to 6.1.0Jani Heikkinen2021-02-112-2/+2
| | | | | | Pick-to: dev Change-Id: Ib7c57e40fe7d5d7723273e282f187fa19dfed11f Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Update dependencies on '6.1' in qt/qtdatavis3d/Jani Heikkinen2021-02-111-3/+3
| | | | | Change-Id: I6d07466d576ed62a4f522af9a1fe74fa4dad0a82 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Disable coin tests if there are no widgetsTomi Korpipaa2021-02-111-1/+7
| | | | | | | Change-Id: If6f9a2b0df8f2ede26ca214769d5ee50e26dec43 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 67265d16c14491e64c52629f5f31a655d0700ff0) Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix macOS build that has -Wunused-function as errorTomi Korpipaa2021-02-115-6/+6
| | | | | | | | | | | Clang may interpret static inline function as unused, although it should not. Pragma it out for clang. Fixes: QTBUG-91053 Change-Id: I8fd8bec5236752189deff8a2f6ceb62e572dca30 Reviewed-by: Antti Määttä <antti.maatta@qt.io> (cherry picked from commit 21ab254164ab0891e12dbd037fc4e163ff9f6e9d) Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix failing autotestsTomi Korpipaa2021-02-115-1/+11
| | | | | | | | | | | | | | | QSG_RHI_BACKEND needs to be forced to opengl for the QML test like in any other QML application. Model/height proxy tests need a bit more time for the proxy data to stabilize, so extra QCoreApplication::processEvents() calls were added to handle that. Fixes: QTBUG-90710 Change-Id: I594040e8d504d680ff1990147835a106cc53d922 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> (cherry picked from commit 33d47ef27ed26c49abb8cae3e9576defe0ea7e5b) Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Prevent segfault with software rendererTomi Korpipaa2021-02-111-1/+1
| | | | | | | | | | | | SW renderer doesn't have opengles2 config set, so we need to make sure the pointer does not include garbage. Fixes: QTBUG-91032 Change-Id: I98aa2f10889fe04c2f6f4af6abd0fe559ba686bf Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 824e0ba21a7b1e56264989c243c3138b09458751) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix build for Qt 6.1Tuomo Pelkonen2021-02-1119-11/+24
| | | | | | | | | Task-number: QTBUG-89299 Task-number: QTBUG-90926 Change-Id: I49822338f94e2bdcb0ae5b29d2211127e40d58f9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit d2c6249bb9292deec97b5a026be5efdb7a83bba7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add conanfile.py to enable Conan buildsTomi Korpipaa2021-01-291-0/+130
| | | | | | | | Fixes: QTBUG-90432 Change-Id: I7715a66bfaea1a6929e7b4589d5954623829838d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Enable documentation buildJani Heikkinen2021-01-292-0/+6
| | | | | | Task-number: QTBUG-90431 Change-Id: I3f633f901e6d59f1e02f3a6a71cabd68706d8f43 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix conan build errorsTomi Korpipaa2021-01-293-3/+7
| | | | | | Fixes: QTBUG-90737 Change-Id: Iab4a0f9d4ff3618dfb4c1675dfd731421de29f9f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove custom namespaceTomi Korpipaa2021-01-28292-592/+403
| | | | | | Fixes: QTBUG-90400 Change-Id: Ia2f1974a21112bad97724717d073d367c4413a7f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update dependencies on 'dev' in qt/qtdatavis3d/Jani Heikkinen2021-01-281-2/+2
| | | | | Change-Id: I33bd7dd94073084c1f5cbc3075c9f8edec37f4c1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add QtDataVisualization to Qt6 CITomi Korpipaa2021-01-271-0/+12
| | | | | | Fixes: QTBUG-90428 Change-Id: I09d8093893d2a570db402801cccfbdaa32c1de10 Reviewed-by: Toni Saario <toni.saario@qt.io>
* Add CMake buildTuomo Pelkonen2021-01-2785-120/+2426
| | | | | | | Task-number: QTBUG-89299 Change-Id: I5becbf39605e566c3d32cb5e210d974df9de27da Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix compilation issues for macOS and Android on Qt 6.0Tuomo Pelkonen2021-01-2713-32/+39
| | | | | | Task-number: QTBUG-89297 Change-Id: I57acf345b6fc64a93d08d41016c755cae4edd6db Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Force OpenGL backend for RHITuomo Pelkonen2021-01-2754-17/+54
| | | | | | | | Set QSG_RHI_BACKEND environment variable to "opengl" to force RHI to use OpenGL backend. Change-Id: Ie1fa0ffe466f97b1bbcc5281c49bbdf6e6d053c0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix qmlbars example for Qt 6.0Tuomo Pelkonen2021-01-273-71/+114
| | | | | | | | Remove API versions from imports, using standard Button and adapted to new TableView Task-number: QTBUG-89298 Change-Id: Ic41c53a6c6d2c0b0542464e78395f5347bdb4e74 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix most of the QML example applicationsTuomo Pelkonen2021-01-2750-977/+129
| | | | | | | | | Most of the QML examples work now as supposed to. Qmlbars still needs fixing and is not included in this patch. Task-number: QTBUG-89298 Change-Id: Ic8bc6511cdb00dd3db0a181b7a31b3bbc39f0556 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* C++ build fixes for Qt 6.0 on WindowsTuomo Pelkonen2021-01-2711-36/+32
| | | | | | | | | | | | | Fixes c++ build issues with Qt 6.0, verified to work on Windows. Changed QQmlListProperty constructors functions types from int to qsizetype GeometryChanged changed to GeometryChange createTextureFromNativeObject changed to QNativeInterface::QSGOpenGLTexture::fromNative clearBeforeRendering and setClearBeforeRendering removed Task-number: QTBUG-89297 Change-Id: I84c723560de2821572af00f62e7780445b6c2595 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update dependecies.yamlTomi Korpipaa2021-01-271-5/+2
| | | | | Change-Id: Ie0be5b43ec600e7828591e10c6ae07be955658d0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Migrate C++ API rendering path to Qt 6Tomi Korpipaa2020-12-1425-220/+228
| | | | | | | | | | Replace QRegExp with QRegularExpression and change usage accordingly. Replace shared QOpenGLFunctions_2_1 with our own copy. Fix header include changes. Task-number: QTBUG-89297 Change-Id: I6d3cf36ba9303ef62db3220816ea35f51eb26a3c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add changes file for Qt 5.15.1Antti 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.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.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.1Antti Kokko2020-01-101-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 86efcb0bea7a9df8aa8be2c836e1a2f7da25fd3a Bump version Change-Id: I67a2381681fdc5378235510a60038df3789b6355 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 20:23:06 +0000