aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/imports.pro
Commit message (Collapse)AuthorAgeFilesLines
* Add a module describing the qmltypes formatUlf Hermann2020-11-121-1/+2
| | | | | | | | | | It's turtles all the way down. And now we can verify builtins.qmltypes using qmllint. Change-Id: I10c98ff8837c04838c3fd9803ef4ea0fd5d7bd0e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Remove qml statemachine plugin from qtdeclarativeKarsten Heimrich2020-08-231-1/+0
| | | | | | Task-number: QTBUG-80316 Change-Id: I584b699a1eec88117f343870bd2cd01075da64f7 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Remove QtQuick.Window pluginUlf Hermann2020-06-151-2/+1
| | | | | | | | | | | | | | | | | We move all the types into QtQuick itself and retain QtQuick.Window only as alias to QtQuick. This requires support for qmldirs that consist of only an import statement. [ChangeLog][QtQuick][Important Behavior Changes] The contents of the QtQuick.Window QML module have been moved into the QtQuick module. QtQuick.Window is merely and alias for QtQuick now. An explicit import of QtQuick will override this alias. Therefore, if you import QtQuick with a different version than QtQuick.Window, you will get the QtQuick.Window types of the version given in the QtQuick import now. Task-number: QTBUG-84639 Change-Id: Ia82afab0ac2faba70cfdaf53dc8dfe4261e1113f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Remove shadereffect dependency from shapesKarim Pinter2020-01-221-2/+3
| | | | | | | | | | | | Uses wavefrontmesh only if the shadereffect feature is there. Path doesn't need to depend on shadereffect feature only on gui module. The shape also missed a sgtexture header. Fixes: QTBUG-81296 Change-Id: I78425ef8a09226b99e9b9f6010dda9dac9009fe5 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-09-121-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4engine.cpp src/quick/handlers/qquicktaphandler.cpp src/quick/items/qquicktableview.cpp Done-With: Richard Moe Gustavsen <richard.gustavsen@qt.io> Done-With: Ulf Hermann <ulf.hermann@qt.io> Done-With: Shawn Rutledge <shawn.rutledge@qt.io> Change-Id: If9558a33f01693ce96420c094e0b57dfff0626cd
| * nothread: enable shapesLorn Potter2019-08-221-1/+1
| | | | | | | | | | | | | | These seem to work fine on nothread build, so enable them. Change-Id: Ib2c7f6e462ca04d82b729bc29c846017f7bf131a Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Fix build without features.itemmodelTasuku Suzuki2019-07-081-2/+2
| | | | | | | | | | Change-Id: Ia4304644a2a365c359eed31c55c2ca9d7d42f10c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-011-2/+2
|\| | | | | | | | | | | | | | | Conflicts: src/imports/imports.pro src/qml/qml/qqmlmetatype.cpp Change-Id: I308436caf55402cb2246cb591c6ac8f83e1febf8
| * Support folderlistmodel for the no-thread configv5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Morten Johan Sørvig2019-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Scan for files on the main thread instead of using a dedicated thread. Use a zero-timer to preserve the async behavior where initiating a scan is fast. This should work well for use cases like a handful of files stored as resources. Task-number: QTBUG-74537 Change-Id: I7bf1b6c7f9dfba69fe4fc2ea1b2dd2f256d66c2c Reviewed-by: Lorn Potter <lorn.potter@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Move workerscript to its own moduleUlf Hermann2019-05-061-0/+2
| | | | | | | | | | Change-Id: I778cfe842ddf1c600a837d8f2061a338887eed95 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix error when building qtdeclarative without Qt QuickRichard Weickelt2019-04-301-1/+1
| | | | | | | | | | | | | | | | Qt Labs Animation requires Qt Quick, but was unconditionally built even when Qt Quick was not present. Change-Id: Idf5093574e409e91b7a662f41f18101907746c6a Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Add BoundaryRuleShawn Rutledge2019-04-271-0/+1
|/ | | | | | | | | | [ChangeLog][Qt Labs Animation] Added the BoundaryRule QML type, a PropertyValueInterceptor that restricts the range of values a numeric property can have, applies "resistance" when the value is overshooting, and provides the ability to animate it back within range. Change-Id: I677b407a351c12b0c5b23c34a45933154310c2cd Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Move xmllistmodel to xmlpatternsv5.12.0-beta4Frederik Gladhorn2018-11-051-1/+0
| | | | | | | | | Latest changes moved to xmlpatterns: e08f9393acc6417598f328d7f4b7b082c5d57afa Change-Id: I7e3054a3f0f11833053746294e3b2b958047394d Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* imports: fix wavefrontmesh inclusionMikko Gronoff2018-10-301-3/+3
| | | | | | | | | | | Breaks Boot2Qt yocto build with following error: Project ERROR: Unknown module(s) in QT: quick-private | Makefile:153: recipe for target 'sub-wavefrontmesh-make_first' failed | make[2]: *** [sub-wavefrontmesh-make_first] Error 3 Change-Id: I6610a25a52b87949c7cfdfef9e39f9225c79e1dc Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Add WavefrontMeshEskil Abrahamsen Blomfeldt2018-10-251-1/+2
| | | | | | | | Add a mesh type for use with ShaderEffect which loads the geometry from an .obj file. Change-Id: I53c9149fc56cdab4a36fccc087abf54a6b50f42f Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Make QtDeclarative work for the no-thread configMorten Johan Sørvig2018-09-051-2/+2
| | | | | | | | | | | | | Force use of the basic render loop, adapt qqmlthread and qqmltypeloader to work on a single thread. Disable components and features that require worker threads: qmldb_server, worker script, shapes, folderlistmodel, threaded render loop, software renderer. Done-with: Lorn Potter <lorn.potter@gmail.com> Change-Id: I77d965947f684f8b7d19284b5decd893395316cb Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* QQuickTableView: move TableView from Qt.labs to QtQuickRichard Moe Gustavsen2018-08-221-2/+1
| | | | | | | | | | | TableView is now ready for Qt-5.12. The only thing missing is documentation, which is currently being written, and on the way. So remove the temporary labs plugin that used to register TableView, and register it together with the other QtQuick items. Change-Id: I7f360eac3934d228904a4133363e336afe0c451a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Allow DelegateModel-based views to support multiple delegate typesPaolo Angelelli2018-08-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a specific abstract QQmlComponent subclass, QQmlAbstractDelegateComponent, and a default implementation, DelegateChooser, that, together with the type DelegateChoice allows determining the delegate type by role and/or index. The patch also adds QQmlAbstractDelegateComponent support to QQmlTableInstanceModel, that is a simplified version of the delegate model, currently only used in the new table view. DelegateChoosers are intended to behave just like Components in the context of the view. This means that they can be declared outside of the view, and also in separate files, and the same delegate component can be used at the same time in multiple views. [ChangeLog][QtQuick][Item Views] Added a DelegateChooser Component to host DelegateChoice instances to choose different delegates in an Item View (e.g. TableView) depending on model roles. Done-with: Michael Brasser <michael.brasser@live.com> Task-number: QTBUG-26681 Change-Id: Ibe24a31daf9142c8a9ff45ef6c65da0aec8a14dc Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Get rid of Qt.labs.handlers import, merge into QtQuick 2.12Shawn Rutledge2018-07-171-1/+0
| | | | | | | ... and clean up imports in examples, snippets and tests accordingly. Change-Id: I5bbe63afd2614cdc2c1ec7d179c9acd6bc03b167 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-05-111-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4compilerscanfunctions.cpp tools/tools.pro Done-with: Lars Knoll <lars.knoll@qt.io> Change-Id: Ia77ee6ede6fc9760ce5a03d68079579a63e5a02f
| * Fix build without features.quick-pathTasuku Suzuki2018-05-101-1/+1
| | | | | | | | | | Change-Id: I15ae07ebeb8d16643cf24cf16a5bbe4f45843fcf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-04-261-3/+1
|\| | | | | | | | | | | | | | | Conflicts: src/imports/imports.pro src/src.pro Change-Id: Icdc39b6169d15b2102acd0e4d550a8d91e4b0744
| * Build fix for -no-feature-testlibPasi Petäjäjärvi2018-04-231-2/+2
| | | | | | | | | | | | Task-number: QTBUG-66609 Change-Id: I6d96b14299f7d764414f6482b7b9b003611d8344 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | qtlite: Fix build with -no-feature-testlibMikhail Svetkin2018-04-121-1/+3
| | | | | | | | | | Change-Id: I45ffc2f5ef6147b0c2997fca3961bf3aec21bbfc Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
* | QQuickTableView: add new class: QQuickTableViewRichard Moe Gustavsen2018-04-121-1/+2
| | | | | | | | | | | | Task-number: QTBUG-51710 Change-Id: I8827a9c80bfa1ed3b9116c7625b74e3c5b12bfce Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Add a feature for qml-animationUlf Hermann2018-02-151-2/+2
|/ | | | | | | | | It should be possible to switch it off without globally switching animations off in Qt. Change-Id: I3cae6b72b2c6b5c420f21625208de5e273839438 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerJan Arve Saether2017-07-111-0/+2
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: examples/quick/shared/LauncherList.qml src/quick/items/qquickevents.cpp src/quick/items/qquickevents_p_p.h src/quick/items/qquickwindow.cpp tests/auto/quick/touchmouse/tst_touchmouse.cpp Change-Id: Id692d291455093fc72db61f1b854f3fc9190267b
| * Rename to Shape/ShapePath and remove public JS APILaszlo Agocs2017-06-021-1/+1
| | | | | | | | | | Change-Id: I299354da0632fb0b8487cfb13748ed58b97d75fd Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * Move PathItem to qt.labsLaszlo Agocs2017-04-251-0/+2
| | | | | | | | | | | | | | Change-Id: I1cd686cff60bd40fe2cbbc34f917fac7835b6b7d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Andy Nichols <andy.nichols@qt.io> Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
* | Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-04-131-3/+3
|\| | | | | | | Change-Id: Ie2894830470a69827d4ace3d8af9bee971e3fbd4
| * Fix build without features.sqlTasuku Suzuki2017-04-051-1/+1
| | | | | | | | | | Change-Id: Ia2bf444da6056e3a87ebd5245aeb8c3f819251ce Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Fix build without features.systemsemaphoreTasuku Suzuki2017-04-051-1/+1
| | | | | | | | | | Change-Id: I3924c3193cc0c5b8def860879cd29f5dcb2c2314 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Add features.quick-particlesPaul Olav Tvete2017-03-131-1/+1
| | | | | | | | | | Change-Id: I78b30d254ed64acadcb2acc278ad1dfde55216ac Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Build fix for -no-feature-quick-shadereffectPaul Olav Tvete2017-03-101-1/+1
| | | | | | | | | | Change-Id: Ie1f601c6ae4c6c5d8d23b14a6670979d9c24e209 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-03-021-1/+3
|\| | | | | | | Change-Id: I7e43a0a47d49de38617f6afc7548f9a9e212a851
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-02-241-1/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4ssa.cpp src/quick/accessible/qaccessiblequickview_p.h src/quick/items/qquickmousearea.cpp src/quick/util/qquickanimatorjob.cpp tools/qmlplugindump/main.cpp Change-Id: I84474cf39895b9b757403971d2e9196e8c9d1809
| | * Fix build for -no-feature-quick-spriteStephan Binner2017-02-221-1/+3
| | | | | | | | | | | | | | | Change-Id: I864b436b7cb1e1fedb15555f53951987dc74012c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-02-021-0/+1
|\| | | | | | | | | | | Change-Id: I734539161beb99d37b9d297c536ae154c888b736
| * | Add shared memory image providerEirik Aavitsland2017-01-301-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | Adds functionality to save CPU memory when several processes use the same local image files. Example and autotest will be added during stabilization. Task-number: QTBUG-56279 Change-Id: Iabe1e42620c79adca4f61f3901da41d9d5a723df Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-01-261-2/+2
|\| | | | | | | Change-Id: I7962fd2282792c43af69784c8e98fb050fd928a7
| * Fix build without feature.statemachineTasuku Suzuki2017-01-161-2/+2
| | | | | | | | | | Change-Id: Iea95465a88627e312259ea62a8908d9cbb3f82ac Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2016-11-171-1/+2
|\| | | | | | | | | | | We no longer have any hope of getting this into 5.8. Change-Id: I2decfa47e589ba7ae2d6b951c6517a2c311d0192
| * Imports: Build settings depending on feature settingsFriedemann Kleint2016-11-011-1/+2
| | | | | | | | | | | | | | | | Fix warning: qtdeclarative/src/imports/settings/settings.pro:1: Cannot find feature qfeatures Change-Id: I215801bbadd1a07deef69bb38b0ac31b8da4d64e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge branch remote-tracking branch '5.8' into wip/pointerhandlerShawn Rutledge2016-08-231-4/+2
|\| | | | | | | Change-Id: I1750ed28c5fda878a0a8f2b7bfe4c580c0b7ffe3
| * Adjust decarative after qtConfig changes in qtbaseLars Knoll2016-08-191-4/+2
| | | | | | | | | | | | | | | | | | Most of the changes are optional, but cleanup our QT_CONFIG usage. Change-Id: I5253d53f72f6fb03c2cfedae1e17d94f424a6bbb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Introduce QQuickPointerHandler: base class for nested event handlersShawn Rutledge2016-08-151-0/+1
|/ | | | | | | | | They will be Tech Preview in 5.8, so they shouldn't be available unless you explicitly import them. Task-number: QTBUG-54824 Change-Id: I290854a4e2b76e2cdfef5c216c7fdeb47fbcd390 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* Merge remote-tracking branch 'origin/dev' into HEADLaszlo Agocs2016-05-241-32/+1
|\ | | | | | | Change-Id: If91e0e28d004f1db978dcab393f189743bb69cd5
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-32/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp src/qml/jsruntime/qv4engine.cpp src/qml/jsruntime/qv4engine_p.h Change-Id: I89ffccd699bee675732758d039e22224b275d60d
| | * move builtins.qmltypes to an own subdirOswald Buddenhagen2016-05-131-32/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shadowing doesn't actually work from within a subdirs project, so we need to put it into a separate aux project. it would be possible to put the project file in the same directory, but then a simple "make qmltypes" wouldn't work due to the different Makefile name. Change-Id: Ib90914e4ea5d75f7199399c7e2825690774081c5 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Enable building Qt Quick module with QT_NO_OPENGL definedAndy Nichols2016-03-221-1/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the Qt Quick module depends on either the OpenGL or OpenGLES headers being available at build time. Since we are adding support for adaptations that do not depend on OpenGL, it should be possible to build Qt Quick in environments that do not have OpenGL development headers. This does present many challenges though because in some cases GL types, and classes that require OpenGL are part of the public APIs. However since these classes were never available when QT_NO_OPENGL was defined, it should be possible to redefine the function signatures under this scenario, since it's not possible to break binary compatibility if there never were any binaries to break compatibility with. One of the bigger changes that was necessary to facilitate this change is creating interfaces out of QSGContext and QSGRenderContext. Here the default behavior was usage of OpenGL directly, even though subclasses could override all OpenGL usage. Making them interfaces should bring QSGContext and QSGRenderContext more in line with the other classes present in the adaptation layer. Change-Id: Iaa54dc0f6cfd18d2da1d059548abf509bd71f200 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>