aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-041-1/+2
|\ | | | | | | Change-Id: I3647815e507f5d219ea742413372101c15579b8f
| * QQuickItem::setParentItem: Check for d->window after deref'ing itUlf Hermann2019-10-311-1/+2
| | | | | | | | | | | | | | | | The window may have been deleted. In that case there is nothing to do. Amends commit 73ad6e87bbeceea5830ab3a6b3dc66fa99e30f45. Change-Id: Ib591f34b51f58d49ed0b065be7025f8e54777c10 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-3118-29/+275
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/qml/common/qv4compileddata_p.h src/qml/types/qqmlbind.cpp tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp Change-Id: I6a137907e63445f17a3d6181b832a6bd76135bb2
| * QQmlProperty: handle reads of QQmlPropertyMap correctlyFabian Kosmale2019-10-302-3/+30
| | | | | | | | | | | | Fixes: QTBUG-79614 Change-Id: Iaf84c0178dc88072a367da2b42b09554b85c7d57 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * QML Drag: Prevent crash when using image provider urlFabian Kosmale2019-10-302-1/+26
| | | | | | | | | | | | | | | | | | | | For attached property objects, qmlEngine will not return an engine. However, QQuickDragAttached's parent is the object to which it is attached, and from that one we can get the engine. Fixes: QTBUG-72045 Change-Id: I40748dd11ea3eb4604c37e932b2cfd3baad6fd1f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Merge remote-tracking branch 'origin/5.13.2' into 5.13Qt Forward Merge Bot2019-10-295-2/+79
| |\ | | | | | | | | | Change-Id: I2b55bea338aa854d940a6da9b6703866209e6ba6
| | * Set the screen on the QOpenGLContext to be the same as the windowv5.13.2Andy Shaw2019-10-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | This ensures that the QOpenGLContext has the right screen information and can create a compatible context for use with QQuickWidget. Change-Id: I9d78ff2b616e5c1d1c11d1da438ce336a0f24953 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | * Handle null in QQuickPointerEvent and QQEventPoint debug operatorsShawn Rutledge2019-10-171-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | For example qDebug() << event->asMouseEvent() could crash if the event is not a mouse event. Change-Id: I34ffadeb9fc23f42d1d6939190c43a6486eea533 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| | * Add changes file for Qt 5.13.2Antti Kokko2019-10-171-0/+63
| | | | | | | | | | | | | | | | | | Change-Id: Ibfc31704442f9a911f37cdda3baa48e2ccb34c42 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | Change-Id: I7345dd5dc9684c19e075d4d81c6a4df7421cae27
| | * Merge 5.13 into 5.13.2Frederik Gladhorn2019-10-1132-33/+494
| | |\ | | | | | | | | | | | | Change-Id: Ib1a7bdda1cde721efb356b2d043b26e2db7386ae
| | * | Doc: Add a \note about the (broken) Binding value restoration policyUlf Hermann2019-10-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78566 Change-Id: Ic76b6212f4ccc3ce8b9199166223e92c203272a5 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * | | QQuickItem::setParentItem: add child earlierFabian Kosmale2019-10-293-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling (de)refWindow can trigger QQuickItem::windowChanged, which in turn can call a user defined windowChanged handler. If that signal handler were to call setParentItem, we would encounter an inconsistent state: The item already has its parent set, but that parent would lack the item in its children list (as we would only call refWindow at a later point). Fixes: QTBUG-79573 Fixes: QTBUG-73439 Change-Id: I46adaa54a0521b5cd7f37810b3dd1a206e6a09c6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | qv4compileddata: do not use raw constexprFabian Kosmale2019-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Necessary after change 50481fb909c2bbbc26a193e23783e5b0151168b9 in qtbase Fixes: QTBUG-79563 Change-Id: I72c94cd87b881f2fb3fee005f73583f64cbf68e4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | | Add missing emits from various property setters in {Grid,Row}LayoutJan Arve Sæther2019-10-252-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ac473b3d46ff1f898c1607deb6ad3d586753244 Fixes: QTBUG-79359 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Loader: Actually clear initial properties when changing sourceFabian Kosmale2019-10-244-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-79435 Change-Id: Ic99a3b1a9d64426a64117b90a3e11fe99af0d260 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Rename some variables and a function to improve clarityJan Arve Sæther2019-10-242-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rename firstVisibleItem() to firstItemInView() to reflect its behavior, as the comment requested ;) * Likewise, rename some related variables Change-Id: I98e25d5d47a4acb56a2b4f2bd75bec062ff770ee Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | | Adapt test case to avoid null characters in directory namesUlf Hermann2019-10-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file system engine in QtCore is stricter now about these things. In the particular example we have here, the first character of the imported directory was a null character, which would previously lead to the whole import being ignored. We cannot do such nasty things anymore. Therefore, comment the import out, in order to retain the old behavior. Fixes: QTBUG-79562 Change-Id: I04917bf7db32e9d09e5919555740a263af2d1795 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | | | Add vulkanunderqml to the list of examplesLaszlo Agocs2019-10-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib2e477ec29bf352876011adf0aa2cdcf456bd091 Fixes: QTBUG-79541 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | | Fix assertion with certain Text items when rendering with MetalLaszlo Agocs2019-10-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caused by a -1 vs. 0 discrepancy between the QRhi and the OpenGL glyph caches. width() and height() are expected to return 0 for an empty image, but this we forgot to honor in the QRhi version. That returned the width or height of a QSize, and those are -1 when default constructed. (there are good reasons for that, it just happens to not match the non-QSize-based code path here) Change-Id: Idda0d2f77430abea79d4004b765077032e06954b Fixes: QTBUG-79533 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | | Enhance Layer.smooth docsLaszlo Agocs2019-10-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...to tell what the default value is. Change-Id: Icb361b8271f4d81390322f9ce94db6e04b530937 Reviewed-by: Karim Pinter <karim.pinter@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | | qmllint: fix typoFabian Kosmale2019-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I02a6f4dd1804251e0420f2fbc334ee9c38d3dc49 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | | Update flowchart to reflect addition of new methodsFabian Kosmale2019-10-242-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed reference to setContextProperty, as we want to deprecate them - Added qmlRegisterSingletonInstance as a different way to register a singleton and as a replacement for setContextProperty - Replaced no-argument qmlRegisterType with qmlRegisterAnonymousType - Restructured graph, removing a few choices Task-number: QTBUG-78952 Change-Id: I1882d3fdd281fd15ae9940127d078457f2942edb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | | QML: Consistently check for debugger before loading cache filesUlf Hermann2019-10-247-19/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In debug mode we don't want to load cache files. Fixes: QTBUG-79443 Change-Id: Ie3e2c70d54e66f24846070aee952a86934099695 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | | | Add support for scanning qrc files in qmlimportscannerAndy Shaw2019-10-246-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reuses the ResourceFileMapper and extends it slightly to return full paths on request. Subsequently, this is moved into a shared directory inside tools. Fixes: QTBUG-55259 Change-Id: Ice5fc68d03b767a4185742e182556ab4290bd28d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | | | Fix typoRobert Loehning2019-10-212-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I6bdb4ca295853d4c179198adcc0856d86b182656 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | | Pass suitable nFormals when constructing JS stack frameUlf Hermann2019-10-214-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The extra formal parameters for signal handlers are not passed in "registers" and therefore should not be given here. Fixes: QTBUG-78486 Change-Id: I18594e0139a7a23d4e53b41e8b00b1e9f2e07aeb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Fix interface handling in bindingsFabian Kosmale2019-10-213-1/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a type had a property with an interface type, we did not support the case where the assigned binding value is convertible to the interface. This is now fixed by adding a last new check to QQmlPrivate::write Fixes: QTBUG-78721 Change-Id: I0b85fbfdf8561ba43610ac343001ae380287a674 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | | Document recent change in allowed alias usageFabian Kosmale2019-10-211-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This amends e5f3e7149b7e130c375c1419f1f804dfeaf578aa Task-number: QTBUG-48150 Change-Id: I64c7426143c82d6ee45b07a40e961b7b7c1faf16 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | | Fix broken scaling with high dpi + rhi + thread loopLaszlo Agocs2019-10-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The arguments to renderSceneGraph() were incorrect in the threaded render loop, unlike basic. Fix it up to follow what we do in the basic loop. (The first argument is the QWindow size (logical). The second is only used when rendering via the rhi, and is the output surface/layer size, in pixels. This will get simplified in Qt 6.) This fixes broken rendering with Metal and the threaded render loop for windows with dpr > 1. Change-Id: I427ba5def8cc34900e6fe650e1006ca5f0fa90a4 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | | Support DXT1/3/5 in compressed texture atlasv5.14.0-beta2Michael Brasser2019-10-172-3/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: I791adbfce96481aea71bb285e48b89cb5db08e1c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | | Use QV4 namespace for ValueTimo Aarnipuro2019-10-172-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Value" is a globally defined type on INTEGRITY platform, which causes the compiler to become confused about ambiguous use. Change-Id: Ic01ce9cf3a8a2c901b3fbe1aa68b419f2778b089 Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | | QFlagPointer/QBiPointer: insert static assertions in addition to dynamicThiago Macieira2019-10-161-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Static assertions weren't really a thing back in 2012 when Aaron wrote this code. Change-Id: I8d95fbaf90e842b9b44dfffd15cde4c154e22810 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | | | QML: Extend QML loader thread's stack sizeErik Verbruggen2019-10-165-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, on some platforms non-main threads have a very limited stack size. Extend it so that we can parse more deeply nested QML/JS files. The parser expects a stack size of 8MB. Task-number: QTBUG-71078 Change-Id: I5edd6630c870e45c3dbe66e6a2a178f5c6991677 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | | | Android: Fix crash in release modeBogDan Vatra2019-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the "auto" keyword, we would keep a reference to the QStringBuilder, instead of converting it to a QString. This object would in turn keep references to the pluginName string, which the compiler would delete, and we would get a crash later on, when the actual conversion took place. So this is a sneaky compiler bug and the work-around is to explicitly convert the QStringBuilder to a QString right away. Fixes: QTBUG-79230 Change-Id: I0759645c84d6f995f26063ea098cdaea61e924ab Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | | Make ScopedValue's CHECK_EXCEPTION also check isInterruptedUlf Hermann2019-10-162-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While there should be no way to generate an infinite loop from any of the affected methods, you can certainly generate a really long loop, for example with Array(1E9).join(). We should be able to interrupt this. Also, the various call()s could return with isInterrupted set. We should respect that and immediately return. Fixes: QTBUG-78955 Change-Id: I7e18b24db0bf39df03134027b2b5dba452ac7c1c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | | | Check for invalid context in QQmlContextPrivate::dropDestroyedQObjectUlf Hermann2019-10-162-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the context is invalid we won't be able to look up the object by name anymore. In that case there is nothing to do. Fixes: QTBUG-78326 Change-Id: I011ccb6b02a84725c1d5eae24b494516ae2d5fee Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | | | Clarify some rhi related QQuickWindow docsLaszlo Agocs2019-10-151-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "and graphics API other than OpenGL" note is clearly wrong. All that applies to the RHI in general, regardless of the backend. Also highlight more why connecting to beforeRendering() is problematic on the RHI path. Task-number: QTBUG-79221 Change-Id: I4875ff197f53ecb76c796b35f2ddf28bed1dc12c Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | | qmlplugindump: Fix prototype and name for composite typesUlf Hermann2019-10-155-21/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we would always merge everything up to QObject. That would duplicate entries between types that inherit from the same base class. Also, when the composite type doesn't specify a module (because we just created a component from a plain QML file), use the module URI from our version info. As we're dumping the component we can assume it belongs to the module we're dumping. Change-Id: Icf9a58cfe1165f557ebbf7309251e98a0782dc33 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-158-18/+67
|\| | | | | | | | | | | | | | | Change-Id: I7759f6b60f8fda6525b239c7ee2e034194d4ab85
| * | | Fix image particle flickering due to broken state machine logicLaszlo Agocs2019-10-142-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A null QSGNode cannot be returned since that leads to not showing anything in the next frame. That is unacceptable in case there are already particles displayed and we are merely regenerating due to the increased number of particles. Task-number: QTBUG-54673 Change-Id: If610c56f6d82d35a8de6b435fd8b18ceb7adf2e7 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * | | Fix updating of text nodes in QQuickTextEditLars Knoll2019-10-141-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The update algorithm wasn't correctly removing all node that requires removing, as the startPosition is not always up to date when deleting lines of code. Instead, figure out the first Node after the changed region that is clean and keep that one as a reference. Amends 560a1991ac4524ff16352da23a2b54d717548f33. Fixes: QTBUG-74745 Change-Id: I4a2c5bd7a673af5cad1850e3a5b703f9554cd7e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Igor Bugaev <freedbrt@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * | | QQuickTextInput::remove: Fix selection logicFabian Kosmale2019-10-113-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-77814 Change-Id: I96b8990656117430eb12fc4b294a8ece612d3a4b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | | Doc: Add "Using" to other sections for consistencyNico Vertriest2019-10-111-7/+7
| | |/ | |/| | | | | | | | | | | | | | | | Task-number: QTBUG-79061 Change-Id: I5d359d9a8ba48131a3aec5487604e30d3b0370ed Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: Modify area.pressed to windowShown in TestCaseNico Vertriest2019-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-77923 Change-Id: I487c58d1e50de15c00539c7610ab570f11df6027 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: Rename section ObjectModel in Qt Quick Views exampleNico Vertriest2019-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - a section should not have the name of a QML type - caused links to ObjectModel to refer to the wrong page Task-number: QTBUG-79061 Change-Id: I92bbd00e02252d3eca2ad50deca7d573f53f549a Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | qqmlprivate.h: Fix include directiveFriedemann Kleint2019-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add the module, unbreaking the Qt for Python build. Amends 2b371a50cbc1f54284fcea3834834ca58fc28fd0. Change-Id: Ic717f00e5225190c698b4ae8322cbee88087b265 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | qmlplugindump: Drop defaultReachableNamesUlf Hermann2019-10-121-12/+10
| | | | | | | | | | | | | | | | | | | | | They are unused. Change-Id: Id49720bead07e353e448d92a53c2c6aabe265d3a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Fix float value binding to an integerTeemu Holappa2019-10-113-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also NaN values are casted to an integer which causes illegal integer values. Task-number: QTBUG-72442 Change-Id: I3ff3c8e4dc493600360448ea30d949c0017da8c3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Liang Qi2019-10-1030-31/+363
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 17:25:02 +0000