aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-12476-3384/+7599
|\ | | | | | | | | | | | | | | Conflicts: dependencies.yaml src/qml/qml/qqmlengine.cpp Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641
| * QQmlObjectCreator: Drop some dead codeUlf Hermann2020-03-102-6/+0
| | | | | | | | | | Change-Id: Ibfc6fc49b0c09ced04f1263e097e35529e84ef7e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * Quick: Add a public opengl dependencyJohan Klokkhammer Helsing2020-03-091-1/+3
| | | | | | | | | | | | | | | | | | Needed since many classes have moved from QtGui to QtOpenGL including ones used in public headers (such as QSGMaterialShader) Task-number: QTBUG-74409 Change-Id: Ib5bb940a1667143364a32a48ad8daf4e36397b98 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * Avoid unloading plugins which register types to prevent crashesFabian Kosmale2020-03-094-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plugins could register an arbitrary number of types in arbitrary places with qRegisterMetaType. This would lead to crashes when the plugin is unloaded, as the type registry would hold stale references to their QMetaTypes. By not unloading the plugin, the metatypes are kept safe in memory. [ChangeLog][QML][Important Behavior Changes] When writing a QQmlExtensionPlugin which procedurually registers types, you should overload the newly introduced unregisterTypes function, if you want to support unregistration with qmlClearEnginePlugins. Additionally, the destructor of your plugin should not contain any logic. Change-Id: I63b7a153f82be7996dbfca4d36f279c351dc6b9e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * Adapt to the the new QMetaType changeOlivier Goffart2020-03-0916-212/+163
| | | | | | | | | | | | Fixes: QTBUG-82453 Change-Id: I7e5682945a07c3af183becd3947a69568f139d16 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-0998-457/+729
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qqmlirbuilder_p.h src/qml/qml/qqmlpropertycachecreator_p.h src/qmltyperegistrar/qmltypesclassdescription.cpp src/qmltyperegistrar/qmltypesclassdescription.h src/qmltyperegistrar/qmltypescreator.cpp src/quick/items/qquicktext_p.h src/quick/util/qquickvaluetypes_p.h Change-Id: Ic209741592e7b85820bf3845722023a190ebc1c5
| | * Avoid using deprecated QTabletEvent::device()Simon Hausmann2020-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | That member was removed in qtbase dev. Change-Id: Ia2e69ee53e154fdb9b8b4c707ac5a463011cf0c1 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * Doc: clarify the fontSizeMode property in terms of Rich and Styled textAndy Shaw2020-03-061-0/+6
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-56650 Change-Id: I7b750031f3af368de7f7cebe64a5d1ce77f68408 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * Remove duplicate add of qqmljsengine_p.h to HEADERS in parser.priFawzi Mohamed2020-03-031-2/+1
| | | | | | | | | | | | | | | Change-Id: I6848575df79be5f84e55e1e9ae9282216424afeb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Get rid of extra spaceFawzi Mohamed2020-03-031-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I11e5c9e95974e89f2fd1571ca4b97a0f2ac3309a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-03-039-8/+74
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qmlmodels/qqmltableinstancemodel.cpp src/qmlmodels/qqmltableinstancemodel_p.h Change-Id: I89339b1cb41ba27fe30c79530859a1c2bfbecc69
| | | * QQuickItem: prevent endless loop in focus tab chainWang Chuan2020-03-031-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the commit a18ab2a3822e0d, we promote the [startItem] in focus tab chain when it is invisible to prevent endless loop. However the problem still happen if the [startItem] is equal to [firstFromItem] Fixes it by compare the [current] item with the original start item Fixes: QTBUG-81510 Change-Id: Iae0207f39e2b8c4fc6ed0cf36f0a855668accfba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | | * QQuickTableView: Immediately delete delegates when possibleUlf Hermann2020-02-283-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the dtor we don't need to care about any side effects a direct delete may have. Rather, any deleteLater() may not take effect anymore as the event loop may be gone already. Task-number: QTBUG-82000 Change-Id: I97935dc47fbbfd0c050e80c333c36a05f685c45d Reviewed-by: Joni Poikelin <joni.poikelin@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | | * QQmlTableInstanceModel: Fix refcounting of metatypesUlf Hermann2020-02-272-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reusable items pool should only hold unreferenced objects. Therefore, we can immediately delete them when draining. release() is not suitable here because it unconditionally decreases and therefore underflows the refcount. Furthermore, the metatype is also refcounted, which means we should keep it in a QQmlRefCounter in order to not leak references. Task-number: QTBUG-82000 Change-Id: Iefdaaecc34342eb2e3b1e5a3281f2e46ac472347 Reviewed-by: Joni Poikelin <joni.poikelin@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | | * Doc: Add section about QVariantList and QVariantMap as C++ propertiesUlf Hermann2020-02-241-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie18661274880f45d911baf05797a8b384d72f9f7 Fixes: QTBUG-82249 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | | * Fix build with -no-feature-networkUlf Hermann2020-02-243-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-82418 Change-Id: Ibceeefed75941d963e6b79b44e9231d0d8053221 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | | * Fix texture coords for the compressed texture atlasMichael Brasser2020-02-211-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The texture coords should be based on the actual image size, and not on the padded size. Change-Id: I262b7ca93e26c48324ec892a988f2fc62132175e Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | * | Fix building qtdeclarative without QMovie supportJean-Michaël Celerier2020-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id8e8b04e722bd9fc84b6b78530f75cf8d6d96da7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | qmltyperegistrar: Mark non-QObject types as uncreatableUlf Hermann2020-03-022-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmlplugindump does so, and in fact they are uncreatable. Also, make qmlTypeRegistrationMode() more robust. Each classDef should really either be an object, a gadget, or a namespace. Change-Id: If39bbbf6f9a4fdb269d095ca10d60ad5d87ca62d Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-03-024-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step cloaser to that goal. Change-Id: I3214ad6ccaca9dfd4a026589cabeb40cbf4a6298 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | doc: fix typo in signal nameRolf Eike Beer2020-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I19b3a78ddbde481af8847a3d340e62d56240de29 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | Restore offset/length in QQmlJS::DiagnosticMessageSimon Hausmann2020-03-0246-252/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed in a few places outside of declarative, so this change restores the loc member in DiagnosticMessage and moves QQmlJS::AST::SourceLocation into common's QQmlJS namespace/directory. QQmlError is unaffected and retains only line/column. Amends d4d197d06279f9257647628f7e1ccc9ec763a6bb Change-Id: Ifb9d344228e3c6e9e26fc4fe112686f9336ea2b2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | * | Deprecate non-const version of saveToFile()Jan Arve Sæther2020-02-282-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It will be removed in Qt 6 Change-Id: I7d8853ce3008bb2c594caa5a23e2964158717fe4 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | Properly deprecate QQuickText::doLayout() and get rid of it for Qt6Jan Arve Sæther2020-02-282-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It was only deprecated through its documentation. Change-Id: I0b7bdeec4ed965c3df627a03ab0e539c4e9c2018 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | Revert "error -> networkError to fix deprecation warning"Timur Pocheptsov2020-02-282-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 391bd68b4045268b389780f4b08d2f07951b45bf. Reason for revert: this warning is only temporary, the patch fixing it - is coming. But the original change of error->networkError was reverted in 5.15 to make the new patch, changing signal name instead, work. Now qtdeclarative does not compile - it calls non-existing function. Change-Id: I276562564c8954f67dcdf4fd5d08afd5f3f9dc8b Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | error -> networkError to fix deprecation warningFawzi Mohamed2020-02-272-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I80d518a1b21185baba0d4934ebf486809e086f9f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | V4: Fix mark stack overrunsUlf Hermann2020-02-277-62/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of applying a heuristic on when to call drain() in unrelated code, we check the stack limit on each push(). If the soft limit is reached we try to drain. As drain() itself can push again, we try to limit the stack size by allowing at most 65 recursions of drain(). If none of that helps, we crash with a meaningful error message. This allows us to remove all the hacky drain() calls in other parts of the code. Change-Id: Ib979339470da0e85981de8131e7997755b757c71 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | QQmlDelegateModel: Avoid use-after-freeUlf Hermann2020-02-271-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The iterator may be invalidated by addCacheItem(). We can retrieve the relevant properties before, though. Change-Id: Ia3bbc50d16a7563097239177a75c9e2eab777a33 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | Revision properties and methods added in 5.15Ulf Hermann2020-02-275-9/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I00e3f9535e819d9d0d547c9d3cf50be469cf9339 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | * | Add revision to QQmlTypeNotAvailableUlf Hermann2020-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic5ce3c50a4a7e43c7d3ba6b105de3ed08021227b Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | Move dependencies.json files into the right placesUlf Hermann2020-02-263-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The workerscript and models qmltypes are built from the library directory, the testlib qmltypes are built from the plugin directory. Change-Id: Ifc497aaf8204616ca817ee08ad86383ab2cbbdae Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | * | Propagate the LanguageChange events from the QQuickWindow to the itemsAndy Shaw2020-02-252-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-78141 Task-number: QTBUG-82020 Change-Id: Id47f8efe77cd3f6bfd330c8759059e19de5a86d2 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | qmltyperegistrar: Correctly collect attached typesUlf Hermann2020-02-253-25/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Their revisions were missing from the qmltypes. Change-Id: Iec7a5ad1c56135c761f6a1fe66904cf25d039850 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | * | Export QQuickRootItem to QMLUlf Hermann2020-02-252-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It was exported in 5.14, so we should probably still do so. Change-Id: Id44783c72fff50aee63d7c5a72f12ff9ca895a6b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | * | Provide a way to statically register namespacesUlf Hermann2020-02-252-8/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, qmltyperegistrar would stumble over any QML_* macros in namespaces, as the namespaces could not be used as template arguments. However, namespaces are intended to be usable by QML as uncreatable "types". Now, qmltyperegistrar checks the namespace flag that moc records in the JSON output, and if that is given, registers an uncreatable metaobject instead of a type. Therefore you can use QML_ELEMENT and friends to register namespaces, just like you would register classes (except that they're implicitly uncreatable, of course). Task-number: QTBUG-68796 Change-Id: I186d7e9425471c32fb1a1f29c0c0b946afb2a9d2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | * | QQuickColorSpaceValueType: Version importFabian Kosmale2020-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9396157f4b85ac075343426b22fff98b436e80d6 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | Revert "Replace call to deprecated QNetworkReply::error method"Timur Pocheptsov2020-02-247-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e5a4ba4a5573ace08def218b985dde83de0805fb. Reason for revert: it was decided to re-name a signal instead, like it's done in QProcess. Change-Id: I0f393c482d8be506430258d7afd4a0056611831f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | * | Warn when requesting unknown RHI backendJohan Klokkhammer Helsing2020-02-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When QSG_RHI_BACKEND is set to something we don't recognize. Change-Id: Ifa18cf38bc110e3a96b94fa89abac5bdfd70ba8a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | * | Doc: Fix QQuickTableView snippetUlf Hermann2020-02-244-43/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use static registration, provide a .pro file, and make it load and show the right file. Change-Id: I949831a399ce00cd8b3d012d8bd4e95a1efcdeb5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Doc: Fix documentation from QQmlEngine::singletonInstance()Ulf Hermann2020-02-241-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't suggest procedural registration of C++ types. Change-Id: Ib133fa7557f7555222fc55344a29967efc5c1f6f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Revert "QQuickItemView: do not set parent to nullptr upon destruction"v5.15.0-beta1Ulf Hermann2020-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5445fcac36d7122d533a2bdf0fcfe6206b7f3ff4. The original commit avoids a warning generated for a dubious use case and breaks controls2 in a non-trivial way as a side effect. We should rather live with the warning. Task-number: QTBUG-82368 Change-Id: I6197bb63036cb25ec3e88f549667519b8f3ff13a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * | | Stop using Qt::DateFormat's locale-dependent membersEdward Welbourne2020-03-061-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They're going away on dev. Amended tests to match. Task-number: QTBUG-80441 Change-Id: I00540d2f7a796ae9c080a0fb9f144c145f00ad57 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * | | Use static_assert to "protected" QMatrix4x4 accessorSimon Hausmann2020-03-041-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The size in qtbase had changed but this went by unnoticed because it only failed at runtime and in the CI the first failing build had assertions disabled. Change-Id: I8891d0a1d0d306629b23eba042ce367cfdb64dfa Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * | | Fix build without commandlineparser and temporaryfileTasuku Suzuki2020-03-041-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qmltyperegistrar uses QSaveFile which needs features.temporaryfile Change-Id: Ib64eb2d357ee5e75f12f81f15bbe4969d4d96872 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | | Fix build without features.settingsTasuku Suzuki2020-02-282-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error: static_assert failed due to requirement 'bool(-1 == 1)' "Required feature settings for file [snip]/qsettings.h not available." QT_REQUIRE_CONFIG(settings); Change-Id: I0759f884531179ed5f625f21c5559389aef5c4ad Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | | Remove deprecated PinchHandler.m{in,ax}imum{X,Y} for Qt 6Jan Arve Sæther2020-02-262-69/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id941d7dc6b6ce9207db09cf4790f4401515dbda5 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * | | Provide the labs imports also under QT_VERSIONUlf Hermann2020-02-216-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that they all have QML_ADDED_IN_VERSION we can allow the user to import them also under a later version without losing compatibility. Task-number: QTBUG-71278 Change-Id: I74b9c758ec37ef41e1a53873266df0eeebfcabc7 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-2125-97/+163
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/quick/qquickmousearea/BLACKLIST Change-Id: I3de2c6377d57f5f9204d2cfc688d50a7a0b4150c
| | * | Fix QML basic type documentationEdward Welbourne2020-02-201-26/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the documentation of some limitations that no longer apply. Fixed up grammar in the process. Fixes: QTBUG-82249 Change-Id: I807cbef10393f11bf864cf44ddd7556aa0eabb92 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | Avoid cast from ASCII to QStringUlf Hermann2020-02-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous attempt to fix this was lost in a merge resolution. Change-Id: I0638c434543d231352c44687b06bf429b7be7a04 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 10:46:42 +0000