aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix include paths of QmlDevTools[Private] for framework buildsJoerg Bornemann2020-01-071-11/+30
| | | | | | Change-Id: Ifd0d1751f3532773e9258189d4a2e930a41b7625 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Post Merge FixesLeander Beernaert2019-11-2510-12/+61
| | | | | Change-Id: I13bc3aef318d8b497b01c61fcca7760abd96339a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-25131-746/+2883
|\ | | | | | | Change-Id: I48b9c2e4f3a75c18470c55f73f2089dc1401de54
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-158-21/+101
| |\ | | | | | | | | | Change-Id: Ibb3be39cbdaf363f017fdfd62e4647acbc3443cb
| | * Make QQuickFbo work with the OpenGL backend of QRhiLaszlo Agocs2019-11-143-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So no matter if Quick goes directly to OpenGL, or via QRhi, QQuickFramebufferObject will still work. Also fix up the fboitem example to use a ShaderEffect that works with both rendering paths. With graphics APIs other than OpenGL the item will be empty, as QQuickFbo is not something we can support there. Task-number: QTBUG-79222 Change-Id: I52177d3a75f619f7075a2fc829573c17031eded1 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| | * Allow AnimatedSprite to finish on the last frameMichael Brasser2019-11-133-4/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][AnimatedSprite] Add finishBehavior to allow a sprite to finish on the last frame. Task-number: QTBUG-59090 Change-Id: Id45e879cdc4905f43e2ac3cb2529181390d47aab Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * qmltyperegistrar: Search for foreign types also in MODULE_BASE_OUTDIRUlf Hermann2019-11-111-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | That's where we put the metatypes from the same module in order to be able to access them before installing. Those are generally more recent than the installed ones, therefore prefer them. Change-Id: I823ef53d9b1a39d00d6c75dde14e1942722514a7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * In case of prefix build, copy qmltypes.prf to build dirUlf Hermann2019-11-111-2/+10
| | | | | | | | | | | | | | | | | | | | | Otherwise we cannot use it when compiling QML itself. Change-Id: I79dd77f56ffcb61a89109829824958b1d6bd6583 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-119-1/+1171
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.pro Change-Id: I07d8cd0becb35caa9c4dbd2c3067403b3726202d
| | * qmltypes.prf: Assume bare filename for QMLTYPES_FILENAMEUlf Hermann2019-11-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise the user has to specify for example $$OUT_PWD/plugins.qmltypes in order to generate a file with a specific name. Change-Id: I72b3c0840e35e7fde454a32663f601de1c7333ce Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Disambiguate do_install target for qmltypesUlf Hermann2019-11-081-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | qmake does pure lexical matching on those names, disregarding any scopes. Therefore, this target was the same as the do_install target in metatypes.prf. Change-Id: If06c01d7666ee1efc27d96c33cc9e0dabaa6ed80 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | * Move qmltyperegistrar into srcUlf Hermann2019-11-088-0/+1170
| | | | | | | | | | | | | | | | | | | | | | | | | | | We want it to be available early in the build process. qmltyperegistrar will be required to build qml, quick, and various imports. Change-Id: I15b827cd4b322a2bcea2780eeedb8dbe132aa59a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | * instanceof: return false instead of throwingFabian Kosmale2019-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Important Behavior Changes] Using instanceof to check whether an instance has the type of QObject or one of its derived classes used to raise a TypeError, if the instance was not derived from QObject. Now, it instead returns false, which is more in line with the ECMAScript semantic. Fixes: QTBUG-79868 Change-Id: I0999807165eb36e7ebb888dce66238619a02a127 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-0820-55/+182
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp Change-Id: I1c0c7c44053bf3d5f8f9723662bd0fe67253c8ae
| | * Use a temporary getter for QObjectPrivate::threadDataGiuseppe D'Angelo2019-11-072-5/+5
| | | | | | | | | | | | | | | | | | | | | In preparation of making it an atomic. Change-Id: I549fc224e7d4006585c26ac45f82784ffb030613 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Register compiled-in QML typesUlf Hermann2019-11-075-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | If we compile the QML types into the main application we cannot depend on plugin loading for triggering the registration. Rather, we need to register them immediately. Change-Id: I910fb13359f8b7524eafd7693c85205cb4ed4cd8 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2019-11-079-29/+64
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp tests/auto/quick/qquickloader/tst_qquickloader.cpp Change-Id: I85fd38cfa00cd60197a1c981bfcc16fcb896cfe9
| | | * 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-319-29/+63
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-301-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-293-1/+15
| | | | |\ | | | | | | | | | | | | | | | | | | 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>
| | | | | * Merge 5.13 into 5.13.2Frederik Gladhorn2019-10-1114-32/+63
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | 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-291-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ac473b3d46ff1f898c1607deb6ad3d586753244 Fixes: QTBUG-79359 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | | * | | Loader: Actually clear initial properties when changing sourceFabian Kosmale2019-10-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | | | Add API to get more information for each line in a QML Text elementTimur Kristóf2019-11-043-12/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously there was no way to know what area is occupied by each line in a QML Text element. This commit adds new API to expose implicitWidth and isLast on QQuickTextLine for use in the lineLaidOut signal. It also adds improved documentation to the lineLaidOut signal and an example usage of the new API to the text layout example. An example use case of the new API is eg. to allow embedding timestamps and indicators within a text paragraph, to enable creating more efficient layouts. [ChangeLog][QtQuick][Text] Added new API that exposes implicitWidth, and isLast on the QQuickTextLine for use in the lineLaidOut signal. This allows the user to layout other items relative to the lines of text. Fixes: QTBUG-78277 Change-Id: Ibc754db17c78efb01468106aba32e30d70d2f4df Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | | | | Cleanup and document AnimatedSprite::start()/stop()Michael Brasser2019-11-011-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3acbff54ca7b2131b84ab739f99ac982ebda65ea Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | | | | Correct a typo in external-resources.qdoc (hhttps -> https)Thibaut Cuvelier2019-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I35cbcef3c9a8959a4950f67bedf93b6ffa88ad52 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | | | | | Take a copy of the children list before emitting the destroyingItem signalLars Knoll2019-11-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clear() emits a signal for each item that is being destroyed. Unfortunately that signal can be connected to some other place that already removes the item indirectly. In that case, we would not correctly emit the destroyed signal for all items, leading to errors later on. Fixes a test failure in Qt Quick Controls 2 Change-Id: I3aff75d9263badd9f87883610c7a00a94ee823d3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | | Generate QtQml's qmldir dynamicallyUlf Hermann2019-11-012-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to skip the worker script import if compiled without qml-worker-script. Fixes: QTBUG-79169 Change-Id: I5edbca96233ae002a464ec10f4f5bb5ab5383ef9 Reviewed-by: Nodir Temirkhodjaev <nodir.temir@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | | Fix build after QList->QVector changes in qtbaseLars Knoll2019-10-314-25/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1575c247de26ba08fba349bf879ed3e017530975 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | | Merge remote-tracking branch 'origin/5.15' into devSimon Hausmann2019-10-291-14/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I56f0f713d20b198cdefbe673c897258b341a3680
| | * | | | | Replace ActiveOcRestorer with QScopedValueRollbackFabian Kosmale2019-10-281-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to have a custom class for an issue that is solved generically Change-Id: Ic4c5f3abd31037e6ab7dac2ced4ed9eeabfdccfa Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-279-21/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4f7033b15c8ac8cff685e7c1a5a6b0343313c98c
| | * | | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-269-21/+17
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaa7dbbe9926d25cfb1b1c51e7013e58cb71d86b5
| | | * | | | 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>
| | | * | | | 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-244-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-2514-24/+75
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I27e7889587b1586758bdfbe29eb1af2bb878e928
| | * | | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-10-2414-24/+75
| | |\ \ \ \ \
| | | * | | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-2414-24/+75
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/qml/qqmlpropertyvalidator.cpp tests/auto/qml/qmlmin/tst_qmlmin.cpp Change-Id: I920c133e839d980ed32c179a0bc4fa44c46e2296
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 16:40:32 +0000