aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Add lancelot test for ShaderEffect blendingPaul Olav Tvete2020-05-196-0/+53
| | | | | | | Task-number: QTBUG-83975 Change-Id: I719fd206b8fa8ee29958eecbac9d618c7850ed80 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit ed8413f7f3b1f0a165c25cbcb9c162b8b12e7864)
* QV4Engine: Fix type conversionFabian Kosmale2020-05-193-1/+39
| | | | | | | | | | | When converting JS arrays to sequence<T> type, check first for the existence of a QJSValue -> T converter function. This restores the behavior from Qt <= 5.14. Amends ecdb4ed275a0869dc668d73d774735575d43a0a3 Fixes: QTBUG-84104 Change-Id: I14c86ab37e34a3c8cff072574d4b90fe9e558535 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit d911034f461859a72b45aeca0f34c34808e3f09b)
* Add missing since to qmlRegisterSingletonType docsNicolas Fella2020-05-191-0/+1
| | | | | | | | | It's relatively new, so better reflect that in the API docs. Change-Id: Iedd8e545228a47d8fcb9ec294a723b5fcd1afe75 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 085af2f28845b14180d7ff07d5d98b51d2e8bb01) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickWindow: pass InputMethod(Query) events on to itemsVolker Hilsheimer2020-05-191-0/+19
| | | | | | | | | | | | | | | | | | | The events were not handled at all on window level, so input from e.g the macOS Emoji keyboard never arrived in the Qt Quick items. Since the input method is likely to use a separate window, the QQuickWindow is likely to not have an active focus item when the input method event arrives. In order to deliver the event to the correct item, walk the scopedFocusItem chain starting with the contentItem as a fall back. [ChangeLog][QtQuick][QtQuickWindow] Pass input method events on to the focus item. Change-Id: I452bb73e13f9cd398c2302303f52a92bda2bb0e3 Fixes: QTBUG-70319 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit dfa51b69bf1f7a6bb3acc0b5cf406039a9e05e83)
* Fix subpixel positioned text with Text.NativeRenderingEskil Abrahamsen Blomfeldt2020-05-191-5/+4
| | | | | | | | | | | | | | | | | We would be generating subpixel positioned glyphs based on the relative positions of the glyphs, ignoring the fractional part contributed by the origin of the text. So if the text origin was inside a pixel, the subpixel antialiasing would be wrong and we would see kerning errors. This was especially visible when using AlignHCenter on text with hinting disabled and resizing the item it was aligning to. Task-number: QTBUG-49646 Change-Id: I0e709ba2b5d2440e34c94c6f819befe0a65a113a Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> (cherry picked from commit e807f9d1d80559b8ff91f1c3cfdd755b3da56a6d)
* Fix Narrator spelling password characters in Quick TextInputAndre de la Rocha2020-05-191-0/+4
| | | | | | | | | | | | | | Quick was not setting the "passwordEdit" accessible state for TextInput controls set with a password-editing echo mode. Thus the platform accessibility layer would not let the accessibility client (Microsoft Narrator, in the reported case) know that the text being edited was a password, making it spell the letters instead of something like "hidden". Fixes: QTBUG-82433 Change-Id: Ic659f031f6bad2ae3d7e500333dc8e2f27797a08 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 788a3a183f8c49c1a88270c1456c3d47423df240)
* Fix warning -Wxor-used-as-powMårten Nordheim2020-05-191-1/+1
| | | | | | | | | | | | Thanks clang 10 warning: result of '2^53' is 55; did you mean '1LL << 53'? [-Wxor-used-as-pow] Change-Id: I164ba4ac12d4ae9dbd6651d50b9f5d2c8928d049 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 50cd8cf97aa89a48a9fbaaeb2515e529e66c7d43)
* Fix building of declarative tests with disabled opengl moduleKai Koehne2020-05-191-2/+3
| | | | | | | | | | | | | | | | The test is already guarded by qtConfig(opengl(es1|es2)?) but even if opengl is available, the opengl module might be missing (for instance because it's dependency qtwidgets is disabled). This amends 8a7e8190b7c2e3. Fixes: QTBUG-83775 Change-Id: I0a37a3ed11817965c261ebced52dae132ce8bbfa Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit acb4c425ff6c4e037df15b0e6847a1994e7e7254)
* Doc: Remove imagePaul Wicking2020-05-191-0/+0
| | | | | | | | | | | Image wasn't removed when the example moved to qtxmlpatterns. Task-number: QTBUG-83958 Change-Id: I5f5d684ebe8bb1a3f089c5fffb42be58c4ee7bf8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 71f37e3857db1bd08d23140c5635ace48d189546) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: fix typo in ListView::layoutDirectionMitch Curtis2020-05-191-1/+1
| | | | | | | Change-Id: I04e1e2ab145aa93952d2dd5ec34321ad87c8af9e Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 0e393fa01fd86e7ffeb35f25c9644f47d99d811a) Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Update flowchartPaul Wicking2020-05-192-0/+0
| | | | | | | | Fixes: QTBUG-83899 Change-Id: I6d494a3515097f07082a32a27a51af93c2d8018e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 01b436c667bfc57677a3a850a96c67237d15d984)
* Doc: add code example of QQmlApplicationEngine::setInitialProperties()Mitch Curtis2020-05-191-0/+11
| | | | | | | | | Show how to use the simpler C++ initializer syntax to create the map. Change-Id: I42b9e8d1be3b45054b1fa8c9f3e026d1e419947a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 8283d501352fdd0feb5ace1f0d78f30af70ca159) Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: add code example to QML_NAMED_ELEMENTMitch Curtis2020-05-191-0/+10
| | | | | | | | I always forget that you don't pass a string. Change-Id: Ied1bf64c8da5e37c38dab8633c048ce4851f8fc4 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 100ac186a2dcfacc173af340c15f3b942017e7ad)
* Fix file name comment in script.mjs snippetUlf Hermann2020-05-191-1/+1
| | | | | | | | Task-number: QTBUG-83504 Change-Id: I4970e929b80f5dae4245404a6db3353f304542ec Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 2c61454e176119f1e0ed3d37d05a3e113b88cb56)
* Fix failing assertion in the GC with JITSimon Hausmann2020-05-191-0/+2
| | | | | | | | | | | | | | | | | | | | Commit d4edf441257b7e5782a6c25802d821647ffcba45 fixed the issue for architectures where the return value register overlaps with the accumulator register and thus clobbers it (x86-64, x86). The issue however persisted on ARMv7 (and in theory also ARMv8). Further investigation suggests that another source of clobbering of the accumulator register may be the caller of the JIT generated code itself, since we never explicitly initialize the register. So if one of the first byte code instructions is the creation of a call context or ConvertThisToObject - anything that saves the register to the JS stack frame - then we could end up with the GC trying to mark a value that contains garbage (or looks like a managed, typically). Change-Id: I719e189c3314c85adb23fb2ab2a0acf26a418d4e Task-number: QTBUG-83384 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit d12c2716064e1dc6013c175952a34146a69aa507)
* Resume AnimatedSprite playback when visibility changesLaszlo Agocs2020-05-193-6/+28
| | | | | | | | | | | | | | | | | | | | | | Amends f5e2783 that was made in 5.6 to avoid updating the AnimatedSprite when not visible. The problem is, if the sprite was running, the expectation is that becoming visible again resumes the playback. It can be argued what the correct behavior is: do we expect the playback to resume from the point when the sprite went invisible, or should it take the time spent as invisible into account? This patch only corrects the immediate problem and provides the former, i.e. playback will resume from the point it had when becoming invisible. The AnimatedSprite scene in the imageelements example is improved to be able to test this. It can also exercise all the start/pause/resume/advance functions now. Fixes: QTBUG-63942 Change-Id: Ieb6d046168a2132659848a36ee0b694c580159b1 Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit af521a8df6caec41f626a4b3319601c20adff711) Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Fix using fonts inside .ttc with render type QtRenderingEskil Abrahamsen Blomfeldt2020-05-191-1/+1
| | | | | | | | | | | | | | | | The file name of a font is not identification in itself, because the file may be a font collection (.ttc). In this case, we also have to use the index of the font inside the .ttc as part of the cache key. [ChangeLog][QtQuick][Text] Fixed a bug where we would sometimes resolve the wrong fonts inside .ttc font collections. Fixes: QTBUG-81810 Change-Id: I40ded703bcdd22dce2be58c5a481f0918e6d352b Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 763897702dfc22075a0366df8dfd8f381103a60b) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix failing assertion in the GC with the JITSimon Hausmann2020-05-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit db3dd029d7cd911712102efd5ea71868494f9f6f introduced the saving of the accumulator register on the JS stack in more situations. This unveiled another bug: When the physical ACC register contains garbage, we may end up saving it on the stack and thus making it visible to the GC. That one may trip with the infamous Q_ASSERT(m->inUse()) assertion failing when the value looks like a managed pointer but in fact isn't. So the question is: How can garbage end up in the physical ACC register? Thanks to a detailed bug report from David Faure, KDE's ktexteditor kateindenttest (testCstyle:comma6 in particular) triggered this situation when run with aggressive GC, where the prologue of a generated constructor function started with two instructions CreateCallContext ConvertThisToObject The first instruction is a call into the run-time with CallResultDestination::Ignore - it's a "void" call. The second instruction starts with STORE_ACC and also ends up allocating memory, triggering the GC when run with aggressive mode enabled. The problem here is the ::Ignore option for the return value. It means that the ReturnValueRegister is clobbered and may contain anything. If the ReturnValueRegister is the same as the AccumulatorRegister, then the STORE_ACC call later will end up writing "garbage" into the JS stack. As a remedy, this patch treats the ::Ignore case special and loads undefined into the ACC when the return value register and the ACC register are the same. Change-Id: I82c7a3456125f9c87e83abb9eb54465106873560 Task-number: QTBUG-83384 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit d4edf441257b7e5782a6c25802d821647ffcba45)
* Check in even more places for exceptionsFabian Kosmale2020-05-184-3/+8
| | | | | | | | | | Amends commit 4c5ed04e64ea9ac0038ae30e1189cfe745b29bd9 Task-number: QTBUG-83384 Change-Id: I0918c27dfa73dff83cbf0f58b41ce8620dff8a0a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit f31a2dc6fc713ee06ea7a9ba45c3ceaace7d735d) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* shapes: Avoid upsetting Mesa on eglfs with kmsLaszlo Agocs2020-05-181-1/+9
| | | | | | | | | | | | | We need to either ensure the context is destroyed before the offscreen surface, or make sure the context is not current (and so the surface is not associated with it anymore) when it is destroyed. We choose the latter here. Change-Id: If4424b98c4d8a718aa49d99285360ded6a5e128e Fixes: QTBUG-82371 Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit 239a90b8d5588bc6536cb81bbba7af8cc049d945) Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Add _q_dumpLayoutTree() for debugging purposesJan Arve Sæther2020-05-182-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found this quite useful for debugging layouts in order to get a snapshot of the layout hierarchy at any point. It will show the hierarchy and the relevant properties that affect the layouting. It's basically QObject::dumpObjectTree() specialized for Qt Quick Layouts (except it will dump it as QML-ish). For the leaf nodes it will leave out unspecified information. Example on how a dump looks like: RowLayout { // Effective calculated values: sizeHintDirty: 1 sizeHint.min : [ 100, 20] sizeHint.pref: [ 100, 20] sizeHint.max : [ inf, 20] RowLayout { // Effective calculated values: sizeHintDirty: 1 sizeHint.min : [ 100, 20] sizeHint.pref: [ 100, 20] sizeHint.max : [ inf, 20] Rectangle { implicitWidth: 100 implicitHeight: 20 } Rectangle { implicitHeight: 20 Layout.fillWidth: true } } } Change-Id: Ie2fcd56d522395cb9d6f55a1ea3f882a7a9da709 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit e0a03d04f8880d81e0c1fec909e5892ae685af71)
* Test if a layout with "fixed" size still do a rearrange if neededJan Arve Sæther2020-05-181-0/+57
| | | | | | | | | If a layout doesn't change size, it should in many cases still rearrange its children. Change-Id: I72ae893da5c561d282800f80c9ab0bec86c557a3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 7e5a691006c1051be1a163fa6a7d40effb6ef0bb)
* Doc: Update description to be more precisePaul Wicking2020-05-181-2/+3
| | | | | | | | | | | Avoid possible misunderstanding where true actually mean "can not". Fixes: QTBUG-35922 Change-Id: I27a119bc236db2c575d5356ce7a457e7ebce7967 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 525fe67ac2eefd37c1758a64fc519e9886475983) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Use categorized logging instead of quickLayoutDebug()Jan Arve Sæther2020-05-184-19/+21
| | | | | | Change-Id: I4db3ebb02a5b541ca8e50e65b9056d398570e331 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 5728f48834b9225a36d3e1dae44ced7579cde358)
* Mouse area: Prevent drag being started with non-accepted mouse buttonsFriedemann Kleint2020-05-181-3/+9
| | | | | | | | | | Redirect move events to the quick item if the wrong mouse button is used. Fixes: QTBUG-82382 Change-Id: I5a78304511b80e6a2e71d2d08a0387509ca96698 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 184f45762e15c1a31bb4295d831fcc9f8a2d4b30)
* Port python check to configure systemKai Koehne2020-05-185-11/+50
| | | | | | | | | | | Also check for py, python2, python3 executables. Task-number: QTBUG-72926 Fixes: QTBUG-84038 Change-Id: I844db4dd630d9b3025eca529ee57565b600ebbac Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 2b41025fc967b37c8bff77c4b75bab333ae13f46) Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Workaround for regression causing most gradient presets to not be shownEirik Aavitsland2020-05-181-1/+1
| | | | | | | | | | | The implementation of gradient presets was refactored for 5.15. It turns out that this exposed some issue with QVector/QArrayData, which again causes most gradient presets to fail to show in qtdeclarative. This patch works around that issue. Task-number: QTBUG-84069 Change-Id: Ifdf5ba8f2621ec3b23e13da2a6dc046408464d4d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-1411-15/+392
|\ | | | | | | Change-Id: I1f653fa9586e7d1e9c23acffba4512cfe9f951b8
| * Export QQuickItemViewFxItem privatelyv5.15.0Shawn Rutledge2020-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | We need it for release builds of the new TreeView (for most subclasses of QQuickTableViewPrivate actually). Task-number: QTBUG-61630 Change-Id: I35c52ef1336ecc2cdfafa8fba473890ce2cff2ba Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Fix parallel installation of qmltypes in a debug and release buildv5.15.0-rc2Kai Koehne2020-05-071-7/+19
| | | | | | | | | | | | | | | | | | This duplicates the logic in qtbase/mkspecs/features/qml_module.prf to handle this situation (also for Android builds with multiple ABI's). Fixes: QTBUG-84019 Change-Id: I9ccbe4a3a79bb979bd6bb2758adb8c2e1ea7903e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Add changes file for Qt 5.15.0v5.15.0-rc1Antti Kokko2020-04-281-0/+283
| | | | | | | | | | | | | | Change-Id: I0b9ea908c0510120a7d4e94f462e057f175abde9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * Merge remote-tracking branch 'origin/5.14' into 5.15.0Qt Forward Merge Bot2020-04-271-2/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/qml/qml/qqml.h Change-Id: I34295e4ea3fc9ec2a42cb93df498d54a5583ddf1
| | * Generate the docs for qmlRegisterSingletonInstance5.14Giuseppe D'Angelo2020-04-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | I think qdoc is once more confused by the mismatch between the actual declaration and the signature in the \fn macro. Change-Id: I25d1be71ffdfc20961e23e06e9132ed09d1e29d0 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Make no-opengl builds succeed with Vulkan or MetalLaszlo Agocs2020-04-251-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends c83ca003248a21e368ebfbf799ef9580e0f4e6ac. In Qt 5.x we do not support using Qt Quick with the QRhi-based rendering path in -no-opengl builds. (such builds default to the software backend in fact) This is due to structural difficulties, such as QSGDefaultRenderContext (the .cpp) being tied to direct OpenGL. This will only get solved properly in Qt 6 when the direct OpenGL code path gets removed. However, compilation should not break in -no-opengl builds, regardless of which other conditions (QT_CONFIG(vulkan), Q_OS_MACOS, etc.) evaluate to true. The original patch missed the case when we have Vulkan enabled or we are on macOS or iOS (which implies enabling the Metal code path). This is now corrected by extending the scope of the condition. Change-Id: I0e87d8b033aed8fdfaca826bcd32596a532380a7 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Inho Lee <inho.lee@qt.io>
| * | Fix crashes when draggingFriedemann Kleint2020-04-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QQuickWindowPrivate::sendFilteredPointerEventImpl(), it appears that the mouse event of the QQuickPointerMouseEvent can be reset in childMouseEventFilter(), causing a crash in QQuickPointerMouseEvent::isPressEvent(). Add checks QQuickPointerMouseEvent to fix this. Fixes: QTBUG-83411 Change-Id: I45f7406de4363974fc6adcac2999cdf55a0c84a7 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * | Merge 5.15 into 5.15.0Alexandru Croitor2020-04-234-12/+11
| |\ \ | | | | | | | | | | | | Change-Id: I07b002df6a05efd577d4ff24e12ef932a4fe7836
| * \ \ Merge remote-tracking branch 'origin/5.14' into 5.15.0Liang Qi2020-04-225-7/+232
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/labsmodels/qqmltablemodel.cpp tests/auto/qml/qqmltablemodel/tst_qqmltablemodel.cpp This follows edc8512580fa16892dc13034e93300cc6a2bba59. Change-Id: I42d1a977d33043045558118948db9151d03950c7
| * | | QQuickRepeater: Fix interaction with PackageFabian Kosmale2020-04-223-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends 3b806a18cc665b5ae0e12d45fe170bfc3f00352a. Eric's change tried to tackle the issue by making the PartModel more well-behaved. However, this still left some issues, as exhibited by the linked bug. This time, we simply make the repeater more robust, and setup d->deletables if it's not done yet. Pick-to: 5.15 Fixes: QTBUG-71964 Change-Id: I58c80c84f73fddaea5d6030f92ffff219ecf2b71 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 28a31148ca02dbb530fd92dfafbcf71c64af4b70)
| * | | Merge remote-tracking branch 'origin/5.15' into 5.15.0Qt Forward Merge Bot2020-04-2116-32/+200
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Iba61fff386b0d76e8d3dbb63e5b86ed8ee79d151
| * | | | V4: Avoid integer overflow in DataViewCtorFabian Kosmale2020-04-212-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-83667 Change-Id: Ia54510bd7c20fb232b117c1ea0fa5facfcd1a9a5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Blacklist a failing hAlignVisual in SLESTony Sarajärvi2020-05-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-76719 Change-Id: I034f15471e64a272f365cfe636d757478ab418d8 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | | | qsgrhisupport.cpp: Fix warningsFriedemann Kleint2020-05-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scenegraph/qsgrhisupport.cpp: In member function ‘void QSGRhiSupport::applySettings()’: warning: ‘QSting::QString(const QByteArray&)’ is deprecated scenegraph/qsgrhisupport.cpp:161:102: note: in expansion of macro ‘qPrintable’ scenegraph/qsgrhisupport.cpp:585:112: warning: ‘void QAbstractSocket::error(QAbstractSocket::SocketError)’ is deprecated Change-Id: I848e089f9d6d26fcb7f44e9e83883f5f971eba3e Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit e3c64aff6579f04353608d4b218f031d9137d3f4)
* | | | | Make Connections object qmlWarning follow a logging categoryDavid Edmundson2020-04-301-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Connections{} emits a warning if an old syntax is used. Unfortunately that syntax is not available in Qt5.12. Downstream needs to support both at once, which means we have code constantly hitting this warning. We can't even #ifdef the QML code. By introducing a logging category we can still have the warning but provides some option for downstream to temporarily disable through an existing mechanism until older Qt is not supported. Task-number: QDS-2007 Change-Id: Idd34c18ae3e8b3e53c430fab8229bb9812370d0e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | | | Text: Fix kerning when horizontalAlignment is set to centerArjen Hiemstra2020-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When horizontalAlignment is set to center, alignedX will potentially return a position that is not pixel-aligned. This causes issues with text layout lower in the stack, leading to incorrect kerning. Rounding the position makes sure we always have a pixel-aligned position. Note that this adapts the same alignment approach as centering done by anchors, so the two will now be more consistent. [ChangeLog][QtQuick][Text] Fixed kerning when horizontalAlignment is set to center. Fixes: QTBUG-49646 Change-Id: I6ce660b0c12435a27998cba78f2c0e98d1d92cc6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | | | Gracefully handle Accessible attached property on non-itemsTor Arne Vestbø2020-04-283-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attaching to e.g. a ApplicationWindow will result in corrupting the window's private data and subsequent crashes. Fixes: QTBUG-83738 Change-Id: Ia708edf29a0356a858ac27ff70125fc38932ba78 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | | Fix visibility of qml window in qquickwidgetMichal Klocek2020-04-242-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add handling for the case where transient window is a offscreen window from qquickwidget. Fixes: QTBUG-82815 Change-Id: Ia121c8477afab8f69e28da4dbdd836f9c7243b2b Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | | | qquickitemgrabresult: Check effective window for visibilityKai Uwe Broulik2020-04-231-1/+6
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using QQuickWidget, the quick scene is in an offscreen window which isn't visible, so grabToImage would always abort with "item's window is not visible". Checking the render window for the item fixes that. Task-number: QTBUG-55879 Change-Id: I58153e02e78623ba4ea6e7beec18a7503de7feeb Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | | Doc: AnimatedImage incompatible with QQuickImageProviderNico Vertriest2020-04-232-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - specify the incompatibility in AnimatedImage documentation - remove unwanted references to AnimatedImage in QQuickImageprovider documentation Task-number: QTBUG-83489 Change-Id: I6f72dde6b19983ff24d08330690d06c65356ccf5 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | | Fix warning about deprecated "end" manipulatorThiago Macieira2020-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9709abb1c3734e10a7defffd1607e09738faee69 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Liang Qi2020-04-225-7/+232
|\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 12:55:53 +0000