aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/imports.pro
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* / Move QtQuick.Layouts to qtdeclarative from qtquickcontrolsJan Arve Saether2016-02-261-0/+1
|/ | | | | | | | This is in order for it to be available without having to install Qt Quick Controls Change-Id: I3f0d0dc108829947cd189b7861944e556e00cef3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add .qmltypes files for built-in QML APIOswald Buddenhagen2015-12-071-0/+33
| | | | | | | | | | | | | | | | | This adds two .qmltypes files: QtQml/plugins.qmltypes describes the components in the QtQml import, and builtins.qmltypes the enumerations in the implicit "Qt" namespace that does not require an import. builtins.qmltypes is automatically picked up by Qt Creator for each Qt version, while plugins.qmltypes will only be parsed if the import is used. Done-with: Kai Koehne <kai.koehne@theqtcompany.com> Done-with: Marco Benelli <marco.benelli@theqtcompany.com> Change-Id: Ia2b1739172c827b945d118b41b647c0a15f3419d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Say hello to the Declarative State Machine FrameworkBrett Stottlemyer2014-08-081-1/+2
| | | | | | | | | | | | | | | | | | The Declarative State Machine Framework extends Qt's State Machine Framework (QSM) into QML to provide types for creating and executing state graphs in QML. This gives you the power of deterministic state machines, but declaratively and without having to write all of the boilerplate code. It is an alternative to the existing QML State type, intended for more complex models. [ChangeLog][QtQML] The Declarative State Machine Framework extends Qt's State Machine Framework (QSM) into QML. This gives you the power of deterministic state machines, but declaratively. Change-Id: I02390ba7f1baed50935364530925bd75087299cb Reviewed-by: Sebastian Sauer <sebastian.sauer@kdab.com> Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
* remove QtQuick.Dialogs and related modulesShawn Rutledge2014-01-071-4/+0
| | | | | | | | | | | | They are being moved to the QtQuick Controls repository (see change ba9ba084124403bd8930e29d8afcea9d64b6c0b6 in qtquickcontrols). This makes it possible to use QtQuick Controls in the implementation. [ChangeLog][QtQuick][Dialogs]Moved dialog implementations from qtdeclarative module to qtquickcontrols module due to dependencies Change-Id: I76d5b71b185dd14a188ea68f18bfec61b4bf2f41 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Add FontDialog to QtQuick.DialogsLiang Qi2013-09-181-0/+1
| | | | | | | | | | | | | As with FileDialog, it tries QPA, then QFontDialog, and falls back to a QML implementation (which is also provided here) if neither type of native dialog is available. The update of plugins.qmltypes files will be in a separate commit. Task-number: QTBUG-31852 Done-with: Shawn Rutledge <shawn.rutledge@digia.com> Change-Id: I066ebbcf44c413af26020ddf8414252b99f5218b Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Say hello to Qt.labs.settingsJ-P Nurmi2013-08-141-1/+2
| | | | | Change-Id: Id4970555b2cbbc2df893dd6269fb8b884ce06e45 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* QtQuick.Dialogs: use URLs for interface with QPlatformFileDialogHelperShawn Rutledge2013-07-221-2/+1
| | | | | | | | | | | | Depends on f5dbc876378ae58a7bdfe1e9664fc81caca18dfb and 5069e203d7aff7fb49bf746071f66bfd41c1ae89 Reverts commits 17ded06804576dfde1b19f82f168f7ceb09ec92c and and d9751bc29d2f80b86eb237226ce832bf2e372f1d Change-Id: Ibe2347f3b57e4e569bc4966735e9623dfd274628 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Disable dialogs to allow changes in qtbase (use urls internally)Frederik Gladhorn2013-07-171-1/+2
| | | | | Change-Id: I9ae09416acdbe437acbe9672d0ecfc42059695ae Reviewed-by: David Faure <david.faure@kdab.com>
* add missing dependency check to widgets pluginXingtao Zhang2013-06-061-1/+1
| | | | | | | | | | QtQuick widgets plugin depends on both QtWidgets and QtQuick module, if do not check 'quick', there will be an error: "Project ERROR: Unknown module(s) in QT: quick" when running make if failed to check for QtQuick module due to no opengl/es1/es2 found during config test. Change-Id: I39d78b9cd9aa9c7f0acf79fdcfc06749ffc10e31 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Add QtQml.Models moduleAlan Alpert2013-03-121-1/+2
| | | | | | | | | | | The moved Model classes can now be exposed in a QtQml import. To keep the QtQml import resticted to more core functionality, they are being exposed in a plugin module. Change-Id: I0a84642a72c7c9bbf9b6ffd2a6c33549f8e61c29 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* adding QtQuick.Dialogs, with FileDialog implementationShawn Rutledge2013-03-041-0/+3
| | | | | | | | | | This will obsolete the QFileDialogItem in desktop components and be available to all QtQuick applications. The QML FileDialog type is dynamically defined in the plugin by detecting which implementation will work on the current platform. Change-Id: I073c7a84bff6c02cf592dc46822a5a4b9c9bcaea Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-101-2/+2
| | | | | | | Change-Id: I23f11c944fafb5863a960dcc83bc1e57e189f662 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make module compile with -no-guiTasuku Suzuki2012-11-221-5/+10
| | | | | Change-Id: I106cf0933930115464b0b7507177e6129098d22b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove pointless qmltest conditionalsOswald Buddenhagen2012-06-261-2/+7
| | | | | | | | it is a module within this repository, and consequently the flag is always set. Change-Id: I8ffdd6903b1b0835725b824a9deb961d0124ce11 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Create plugins for Particles and Window submodulesMatthew Vogt2012-04-051-1/+1
| | | | | | | | | | | | | | | To prevent errors when QML files import QtQuick.Particles or QtQuick.Window before importing QtQuick itself, create plugins for these submodules that make their import statements independent of the QtQuick import. Remove the automatic re-ordering of the imports list prior to loading to ensure registered name conflicts can be resolved by changing the order of import statements. Task-number: QTBUG-24369 Change-Id: I248625fa30a813dddd2a64feb9a489768931939f Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove etcprovider plugin.Michael Brasser2012-02-151-1/+1
| | | | | | | | | | | Handling image providers via QDeclarativeExtensionPlugin is not a pattern we want to promote for library code. The plugin was also missing documentation and autotests. It might be appropriate to be re-added later as an example showing the use of an image provider with a texture factory. Change-Id: I2d8f3208aebd55180bd627b3f9acc0679eb6328c Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove QtQuick1 elements from qtdeclarativeMatthew Vogt2012-02-031-2/+2
| | | | | | | | QtQuick1 is now contained in a separate repository. Task-number: QTBUG-23737 Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Move sqldatabase into a module API pluginCharles Yin2012-01-251-2/+2
| | | | | Change-Id: Icd0bbfe16804abf1bbadbabddf3a30b5b18df30c Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Say hello to QtQuick moduleKent Hansen2011-12-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Move XmlListModel to seperate pluginCharles Yin2011-12-011-1/+1
| | | | | | | | | | | | | XmlListModel is the only feature inside QtDeclarative which depends on the QtXmlPatterns module, move this item to a separate plugin can reduce the unnecessary dependency in most use cases. To use the new XmlListModel, an additional "import QtQuick.xmllistmodel 2.0" is needed. Task-number:QTBUG-22158 Change-Id: I9e19eb6cbba46cd40fb7ffcdbd741f346779a54d Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Remove the InputContext module.Andrew den Exter2011-10-181-1/+1
| | | | | | | | | | | | | The input context module provided a bridge between QML and a QInputContext which allowed an application to implement it's own input method in-process. However since QInputContext has been replaced and now only exists as a QWidget compatibility API this module no longer works with the QtQuick 2 items and porting it to the new QPlatformInputContext API does not seem to be an option as there is no way to override the instance provided by the platform integration. Change-Id: Ica602377436fcea42b9ffd05e1b347e2ee52acc8 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Re-enable QtQuickTest.Rohan McGovern2011-09-191-2/+1
| | | | | | | | | | This was disabled in refactor, but it seems to be working OK, so turn it back on. Change-Id: I35d97342c6ef7be358d9cb593a1eab27c711247c Reviewed-on: http://codereview.qt-project.org/4846 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Make QSGCanvas a QWindow instead of a QGLWidgetGunnar Sletta2011-08-051-1/+2
| | | | | | Change-Id: I71a04f61acff893a35c00204ed11bdf852830485 Reviewed-on: http://codereview.qt.nokia.com/2675 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-121-1/+1
| | | | | | Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Integrate QtQuickTest into QtCharles Yin2011-05-201-0/+1
| | | | | Change-Id: I558821c0dec9166ea1d0d2e1e2f889553c436316 Task-number:QTBUG-16082
* Initial import from qtquick2.Qt by Nokia2011-04-271-1/+1
| | | | | Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 06:38:15 +0000