aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmlmodels/qqmlmodelsmodule.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-141-82/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/folderlistmodel/plugin.cpp src/imports/layouts/plugin.cpp src/imports/localstorage/plugin.cpp src/imports/models/plugin.cpp src/imports/particles/plugin.cpp src/imports/qtqml/plugin.cpp src/imports/qtquick2/plugin.cpp src/imports/shapes/plugin.cpp src/imports/statemachine/plugin.cpp src/imports/testlib/main.cpp src/imports/wavefrontmesh/plugin.cpp src/imports/window/plugin.cpp src/imports/workerscript/plugin.cpp src/qml/jsruntime/qv4sequenceobject.cpp src/qml/qml/qqmlengine.cpp src/qmlmodels/qqmlmodelsmodule.cpp src/qmlmodels/qqmlmodelsmodule_p.h src/qmlworkerscript/qqmlworkerscriptmodule.cpp src/qmlworkerscript/qqmlworkerscriptmodule_p.h src/quick/items/qquickitemsmodule.cpp Change-Id: I5f1fbc3d00e8f583d2c89afc5389de84d68633a7
| * Generate registrations for all importsUlf Hermann2020-01-101-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we can generate all QML type information at build time, we should also use it. Move the types for QtTest into the testlib import plugin. They don't need to be exported from QtQuickTest. Trigger the resource initialization of the shapes library from the plugin so that we retain a dependency and the linker doesn't optimize the module initialization away. Change-Id: Icc8cb338aa03ef1e3085e29356a5db7b73ba0a01 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-161-19/+2
|\| | | | | | | | | | | | | Conflicts: src/qmlmodels/qqmlmodelsmodule.cpp Change-Id: Ibae188f554f931f64f39022417b10e3469685f82
| * Models: Move labs classes into src/imports/labsmodelsUlf Hermann2019-10-151-19/+2
| | | | | | | | | | | | | | We want to have only one import URI per library. Change-Id: I8be524cf361b12bcb423c9efccd4e047ae3d8d0e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-271-18/+11
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/folderlistmodel/plugin.cpp src/imports/shapes/plugin.cpp src/qml/qml/qqmlengine.cpp src/qmlmodels/qqmlmodelsmodule.cpp src/qmlworkerscript/qqmlworkerscriptmodule.cpp src/quick/items/qquickitemsmodule.cpp Change-Id: Ib9215a07aa95b5801ce3cb7287f7903926e8c838
| * Specify parameters of type registration in class declarationsUlf Hermann2019-09-261-18/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using this technique we can automatically register all necessary revisions and minor versions of a type, using the metaobject system. This greatly reduces the potential for mistakes and resulting incompatibilities between versions of imports. We assume that for each type we need to register all revisions of its super types and its attached type, and that the revisions match. That is, if you import version X of type A, you will also get version X of its attached type and of any super types. As we previously didn't take these dependencies into account when manually registering the types, a number of extra revisions are now registered for some types. Potentially, we can now generate the qmltypes files at compile time, using moc. Change-Id: I7abb8a5c39f5e63ad1a0cb41a783f2c91909491b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/dev' into wip/qt6Ulf Hermann2019-09-051-1/+1
|\| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/qml/qml/qqmlengine.cpp src/qmlmodels/qqmlmodelsmodule.cpp Change-Id: Id60420f8250a9c97fcfe56d4eea19b62c6870404
| * qqml.h: add qmlRegisterAnonymousTypeFabian Kosmale2019-08-211-3/+3
| | | | | | | | | | | | | | | | | | This version behaves for the most part like qmlRegisterType(), but it adds a uri and major version, which qmlplugindump can use to put the tpyes into the correct plugins.qmltyes file. Change-Id: I50f620216439a3edc66ac740cb051c2fbb936e51 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Restore compatibility with Qt 5 for VisualDataModel/DataModelGroupSimon Hausmann2019-07-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | This change amends commit af3438cf29925bfcf4ff1a8fa04276580b66ce37 by fixing the visibility of not only Package but also VisualDataModel and VisualDataModelGroup. This is a prospective fix for various failures in qtlocation. Change-Id: I831422fa5d87c4cbaf45a5d766a77ba150d932da Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Remove module registration related Qt version #ifdefsSimon Hausmann2019-07-221-35/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ahead of compiling declarative with a newer qtbase that bumps the Qt version to 6, we can already now remove the Qt 5 code paths related to type registrations as commit 8534634bd204ccdca3edcc244a35be6e81739fce implements those dependencies differently. This also required lowering the minimum minor version for the Instantiator to 1, as it was in the Qt 5 branch. Change-Id: Idd38c967eeb8423509237116803d292bba422f8b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix imports of Package and Instantiator with Qt 6Simon Hausmann2019-07-221-2/+2
| | | | | | | | | | | | | | | | | | | | This change amends commit af1c5e013733b660bc5d813d92e55f2e6d009e4a and synchronizes the minor type version of Package and Instantiator to match Qt 5. Change-Id: I2e25a8b7c79edcf483f4f4e072293c0627f8ec94 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix import of ListModel/ListElement as part of QtQmlSimon Hausmann2019-07-171-2/+2
|/ | | | | | | | | | | | | | | | | ListElement and ListModel were available in Qt 5 since minor version 0 in QtQml and since minor version 1 in QtQml.Models. So one had to either write "import QtQml 2.0" or "import QtQml.Models 2.1". Since the explicit registration in QtQml is gone and to be replaced with an implicit dependency that loads QtQml.Models when loading QtQml, with the same minor version, we need to lower the minor version to 0 for both. This is unlikley to cause any harm as previously import QtQml.Models 2.0 would not produce any types. Change-Id: Iff7c4a1c1b35e4c9d930aa45dd678d8e2d5c823c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add features for the remaining QML model typesUlf Hermann2019-05-031-8/+23
| | | | | | | | The table and object models should be configurable, too, and Package conceptually belongs to the delegate model. Change-Id: Id928f14c5b378b6e7ffcbb98039192fa7c375fa7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Move model types into their own libraryUlf Hermann2019-05-021-0/+124
The model types are not part of the core QML runtime and should only be loaded if you explicitly import them. We cannot enforce that in Qt5 as some of them are available from the QtQml import, but we can change it in Qt6. Change-Id: I1e49e84d748e352537ec2d4af901c034c91d038f Reviewed-by: Erik Verbruggen <erik.verbruggen@me.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 02:29:11 +0000