| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
Use PROJECT_VERSION instead of CMAKE_PROJECT_VERSION, so that the
repo project version is used in a top-level build, rather
than the version of the qt5 project.
Pick-to: 6.1
Task-number: QTBUG-92861
Change-Id: I540849455689e22f954e4f6eeb1ae6a79a583795
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
| |
Fixes: QTBUG-90400
Change-Id: Ia2f1974a21112bad97724717d073d367c4413a7f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-89299
Change-Id: I5becbf39605e566c3d32cb5e210d974df9de27da
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-89297
Change-Id: I57acf345b6fc64a93d08d41016c755cae4edd6db
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I20cec71db97cbf896255d4f6d7e947072a86e2bb
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
| |
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>
|
|\ |
|
| |\
| | |
| | |
| | | |
Change-Id: I9152493c8aed299f0bcffc03651b05d6ae01db22
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|/ /
| |
| |
| |
| |
| |
| | |
Add missing Q_MOC_INCLUDE and adapt to OpenGL split.
Change-Id: I6150876a62ca55ad63c09a128226c2bac428b821
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ia189ad6a24e3284a538cea1f78fcbc9b4687f6b8
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\|
| |
| |
| | |
Change-Id: Ib309fe3b5adee4933ae9a66f4419aec28b088aa5
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-78690
Change-Id: Ib264cb0294f02e2983cba0041a48ff87b7bc4f51
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|/
|
|
|
|
|
|
|
|
|
| |
Modify all the qmlRegisterModule calls to use minor version 15
because minor version zero from 6.0.0 would make tests fail.
This is similar to what was done in qtdeclarative in
c147b20a2c1299b2d659fe7c9472ae3866b6a425.
Change-Id: If3202a887389351dd6efa760b0212e69582d9576
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-73739
Change-Id: Id8a0509b9f4c397c4c1897e47c1915959477cd2c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-74032
Change-Id: I1fca2212a2013fe18388e5e1e20e75847ee6be8b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Without this, properties of Q3DScene added after revision 0 stay unknown
to the QML engine.
Fixes: QTBUG-74016
Change-Id: I7bec39b5984dce6d5724287a79f23cb1cc86d378
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-70264
Change-Id: I2742e2c61e0fe6a2566a11d721f0cbd0135c7a00
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
|
|
|
|
|
|
|
|
|
| |
After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is
not needed anymore. Instead the resource system injects the plugin entry
point with a reference to all resources.
Change-Id: I1ad043f9e676deaea30ae022c090f188066a299c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I849ed97b46cf390fd6c5d3017b7e66f7dd9aeeef
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is the result of running the (experimental) clang-tidy check
qt-modernize-qsharedpointer-create
Discarded changes: none.
Change-Id: Id131553710a846ff131abbc7fd7c01cc5b1da1df
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|/
|
|
|
|
|
| |
Change-Id: I195589565920e795cdae99f837b51917b3831228
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
| |
That is, AFTER the statement of the case label. Alternatively speaking,
resolve dead code problem.
Change-Id: Ia3e896da908f42939148fffd14c480ca73c1be4b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Without this patch the module is not bundled in static builds correctly
causing 'module "<QtModule>" is not installed' errors in during runtime.
As reference: this happens, because 'QQmlMetaType::isAnyModule(importUri)'
at 'qtdeclarative/src/qml/qml/qqmltypeloader.cpp:1422:' returns 'false',
which indicates that the module was not registered.
Task-number: QTBUG-59559
Change-Id: I37003c4305fbe499c9911ff2aefa35deab832bdf
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
|
|
|
|
| |
Change-Id: I0a436ec2606fe6d76665ef147667c7d8ea5c59e4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Adds a mutex to guard that pointer to controller is not deleted while
doing updateWindowParameters. The render thread doesn't have control to
the node mutex, so that won't apply since it may be deleted while requesting
a mutex.
Change-Id: I8897954415c1bd7ab61ef99b420c9ac2aaa89411
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
| |
Change-Id: I7efd56754bae16990fd11081493da0a37698f76b
Task-number: QTRD-1803
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Since commit 709f6370884b110def2e4665df8fa7bbf5fae734 the plugin loader
is strict about requiring the correct interface id, to avoid loading
unrelated plugins in the loader thread (which they may not be prepared
to do).
Change-Id: Ie7ef84be45bb89887fac47fd9ac1d024a0a41acd
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/datavisualization/datavisualization.pro
Change-Id: Ie79d1c1e959bac9a674a9031c36e7914252805b9
|
| |
| |
| |
| |
| |
| |
| | |
TARGETPATH to be removed in 5.7
Change-Id: I5f2b7c6c82e10bed6b7a2358d8269bc0aef26542
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ibaf10cb5806dae0287888a20d26e34d4dfefff75
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I7f504bcd21045d6eaf2534d3ab2416b402e88b87
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
|/
|
|
|
| |
Change-Id: Ib264fe1f2cd1589e2ba1ef2dc7d8f3951e125708
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Datavis is part of the Qt release and there is no need to do magic hacks
to install the qmldir file.
This was supposed to help running examples separately, but we assume
that the lib is shipped with Qt proper.
The problem was that the qmldir file would be simultaneously copied into
the same location twice which will fail on Windows.
Change-Id: I1879fc5ff6303104392a66e54d5c278752a12655
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
-Fix miscellaneous compile errors
-Move manual tests to manual folder and enable export of autotests
-Added widgets requirement
-Fixed autotests
-Fixed renderer and controller synchronization in QML case
-Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL
Change-Id: If6619733725d079e339bef16262e5ea1450ab20f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ic90d3b04434d07e12c313c56d7217d7bf550cdb3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Apparently Qt modules are now required to use Q_SIGNALS and Q_SLOTS
macros instead of 'signals' and 'slots' in headers.
Change-Id: I4140b1fff4386d74bb371176919234366965e887
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
|
|
|
|
|
|
|
| |
Copyright header changes for 5.5.
Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ib4587a608a7b79d863d51e1a9ecd150996245fa7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Primary fix is to not use shared context in qml with WinRT,
as that causes black screen.
Also removed widget apps from build in WinRT.
Change-Id: Id65ce90dbeb80442194ab838952e8cadc91135a6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
This was changed in Qt Creator 3.3 for consistency reasons.
Change-Id: I164b5bff88b2cc3091aaf48e57fb12ef60e2a6aa
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I4ab8d595ac9f8b069057178079ad7714eaf6e13c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
| |
Radiallabeloffset needs 2 decimals, as step size is 0.01
Change-Id: I7766613737beb217f6dd68b5a9aca666b15c7fab
Change-Id: I7766613737beb217f6dd68b5a9aca666b15c7fab
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3392
Change-Id: I786bbf5ee9252b92d43d02d6b88ed9b986b4a5eb
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
| |
Also added missing properties from v1.1.
Task-number: QTRD-3396
Change-Id: Ic001e726dbe09238ab51b1fdfb2a58d99b5e29e2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
| |
Task-number: QTRD-2286
Change-Id: Ibe211caedab231e908af900af65d4075b926a875
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|