| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Task-number: QTBUG-70264
Change-Id: I2742e2c61e0fe6a2566a11d721f0cbd0135c7a00
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
|
|\
| |
| |
| | |
Change-Id: Ic54b1a747b4cab6b293aa9933bff2c6b6dc3d037
|
| |\
| | |
| | |
| | | |
Change-Id: I345d0637c46a80d6bd2054eef7107b8909026bca
|
| |/
| |
| |
| |
| | |
Change-Id: Iebebaf25141b2bf50352eb2455500ae1f18ec499
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I5a834dd3b204deef8b09a926bb496a4d376f1782
|
| |
| |
| |
| | |
Change-Id: Id4a42078d6aab155a599200af01629ab59969675
|
|\|
| |
| |
| | |
Change-Id: I22c00453350070d69e03d1d4cf426a86fbcf0c9c
|
| |\
| | |
| | |
| | | |
Change-Id: Ic1f178389975b730da51ff317ed0ef64348c0483
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ib5df75f2d80dd7ad6e5848295b3557b23c398648
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
| |/
| |
| |
| |
| |
| | |
Task-number: QTBUG-68933
Change-Id: I4947e5906049cadcd2aefd7dfb7aee25fea7a778
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I135ec58950ba88e041d19561353e0946f4a51497
|
| |
| |
| |
| |
| |
| | |
Change-Id: I85cb2874e7896f2f84e20eccc16a7ad457ce35ed
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit f95fc1d0592502285613729816632710c4a265ee)
|
| |
| |
| |
| | |
Change-Id: Ic672091dd6628af4e0abb3702e27ac8cd22b7115
|
| |
| |
| |
| |
| | |
Change-Id: I732a95d5adbd7579b05e8cb2b1afd586d5b5bc58
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I06c078868b98c6210bac5ad450122a191eeedef5
|
| |
| |
| |
| |
| |
| | |
Change-Id: I0c20e133621f4095df5fc7f53a3e1981d248a93f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix Clang warnings
main.cpp(74,13): warning: private field 'm_styleTimer' is not used [-Wunused-private-field]
main.cpp(75,13): warning: private field 'm_presetTimer' is not used [-Wunused-private-field]
main.cpp(76,13): warning: private field 'm_themeTimer' is not used [-Wunused-private-field]
Task-number: QTBUG-63512
Change-Id: I618b0b6e6157b8a82af7e81b178f5156cf9c1bca
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@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>
|
| |
| |
| |
| |
| |
| |
| | |
This change partly reverts commit da3c5925d546282e99f13b450a674c7024fde9ed.
Change-Id: Ifd09b63a56d5f2e8837e461ca6048d80fcb8c916
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Because from Qt 5.12, the the right operator| is found in the Qt namespace
instead of in the global namespace.
One must still add the 'using' statement so this patch can be integrated
using a previous qtbase. But the statement can be removed once qtbase is
updated.
Task-number: QTBUG-67582
Change-Id: Ib79c4623e858988bb55a87ad4fb0c1e0ceee81cf
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Icf25f1e5df654eba7a76620d61fb5516d905f6d0
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some old license header were used. replace it with proper one
Task-number: QTBUG-67308
Change-Id: I6c501ab381c4ebb9f0b3466c303447edf3531915
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Simon Quigley <tsimonq2@ubuntu.com>
|
|\|
| |
| |
| | |
Change-Id: I103882a747cf750dfbfba3f3004b1edfbecaca57
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
These are now longer required on Qt 5.11 where QDoc uses Clang to
parse the documentation.
Change-Id: I8a3bd7d935acf4c93fb8a6179cb8d3327697759a
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QDoc in Qt 5.11 uses Clang to parse the C++ documentation.
Ignore the custom namespace used for Qt Data Visualization when
Clang is used - this resolves all documentation warnings and
generates it as it did on Qt 5.10.
Change-Id: I331bdb07611eb97f1df1896468d11c9341156739
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I568a496e778bbefd7568a93174ae4e0e7f40dd02
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: Id472b54f56aa0e58095c50f896e3cb44c6124cd9
|
| | |
| | |
| | |
| | | |
Change-Id: I0472458c2d3acca239c8d0b076792775b5695a7b
|
| |\ \
| | | |
| | | |
| | | | |
Change-Id: Ie385d52f1f490cbfa76ea2385862455f12f4fed7
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ied0acb882d58707ff0bedb2e8fd06f7e554ed8ff
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
| |\| |
| | | |
| | | |
| | | | |
Change-Id: Ic7d85aece55a90a0fed7ee62a03b1203bbba65fd
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-53141
Change-Id: I2e9fa0a5b72d79acc22c779e68a3dbe6a320a32a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|/ / /
| | |
| | |
| | | |
Change-Id: Ica5f14b80e62b8bb100ebff6f89351ee908bd8c9
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: Ie7a50a1cc66ddffe04933f77323d03941e0d7acd
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I508fc0322f473a476f8943d4171f2242697519fa
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I4e39ad733fec72e2233cd16fc50c96ca96280782
|
| | |\
| | | |
| | | |
| | | | |
Change-Id: Ibc5db332babec46a503f19b496391a9100caecef
|
| | |/
| | |
| | |
| | |
| | | |
Change-Id: I887a82b73b10d0b559651c9cfb0bd81d9a4b816b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Vec3 used on fragment shader when vec2 used on vertex shader. On
surfaceTextureFlat coords_mdl not used at all, so remove it.
Change-Id: I7898db37e7967a7cb9933fe1a05f42a332c06130
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
| | |
| | |
| | |
| | | |
Change-Id: I8eeeed3dca94f94e39350ac62325279c20a9a728
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix m_resetArray so that if it not yet created, then create it. Currently
it is created every time.
Change-Id: I850bd9d2f719cd76bfd3292a439f9585a4e99fc3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
| | |\
| | | |
| | | |
| | | | |
Change-Id: I9255375f69a1b294da4fba89ba390808f47236e2
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Changes the rendering order of custom items to insertion order.
Task-number: QTBUG-64312
Change-Id: I1ce865a3492c145ffa269cd12baa15ffff8d6a59
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: I478999dcb4670fe49802f108dbb7f102024e93fa
|
| |\ \ \
| | | | |
| | | | |
| | | | | |
Change-Id: I4d617d8737910076e35e8a59e2aad07a1cf0a1a9
|
| |/| | |
| | | |/
| | |/|
| | | | |
Change-Id: I117a04d48ccce0c1319d66d6ced9391e7242cd87
|
| | |/
| | |
| | |
| | |
| | | |
Change-Id: I1f2db77065efd4b6509dce8cb1af827ed764e702
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|\| |
| | |
| | |
| | | |
Change-Id: Iea700ac85da7205933622b61e1c43f774c82e45a
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Drop highlighting for 'Surface Example' in favor of 'Qt Quick 2 Surface
Multiseries Example'.
Task-number: QTBUG-60663
Change-Id: I7a8e3c501b7d5eaf500d3e0eca2eb41c17d182d5
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I3e552a83fe8ea72079e3d7dc503db3a7888cebdd
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|