aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-111-0/+2
|\ | | | | | | Change-Id: Ieaf0811cf045af1e6df4db4ab67d7c38ba0d1fbf
| * Build: XmlListModel depends on qtConfig(qml-network)Liang Qi2018-09-101-0/+2
| | | | | | | | | | | | Task-number: QTBUG-70414 Change-Id: I90ca63304bfc20cc5eab113d26f02a5a2a5d76f3 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Update plugins.qmltypesKai Koehne2018-09-0622-35/+501
| | | | | | | | | | | | | | | | | | | | | | | | | | by running cd qtdeclarative/imports; for path in `find . -name Makefile -print`; do pushd `dirname $path`; make qmltypes; popd; done in the build directory. Local file paths in the command line were then edited out by hand. Task-number: QTBUG-70264 Change-Id: I931604aff6a779915708395e8b8dbdf659cbd637 Reviewed-by: Simon Hausmann <simon.hausmann@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>
* | qmlplugindump: Automatically use most up to date QtQuick versionKai Koehne2018-08-305-7/+5
| | | | | | | | | | | | | | | | QtQuick / QML minor version is nowadays the same as the Qt minor version. Change-Id: I4d7ef0b101320ee2179746c95093b62e063adba2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | QQuickTableView: move TableView from Qt.labs to QtQuickRichard Moe Gustavsen2018-08-225-114/+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-174-1/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Remove support for iterating over the proto chain from ObjectIteratorLars Knoll2018-08-021-1/+1
| | | | | | | | | | | | | | | | | | This will simplify moving over to the new iteration model. It implies a very small behavioral change in a few places where we used to iterate over the proto chain before. Change-Id: Ia62c9c51712d6b45e69ca63becdbefab6fa4bf3f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Clean up QQmlCustomParser APISimon Hausmann2018-07-302-5/+5
| | | | | | | | | | | | | | | | Consistently provide a smart pointer to the compilation unit in the two virtual functions. Change-Id: I2f43d4d17102082577f2502424d288d40eb7479d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Doc: bump import version to 2.12Shawn Rutledge2018-07-246-12/+12
| | | | | | | | | | | | | | | | | | This is important since 2.12 is LTS and because Input Handlers are now included. Change-Id: I09417eb873ed7971fc768dddb916954d46091a6b Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Get rid of Qt.labs.handlers import, merge into QtQuick 2.12Shawn Rutledge2018-07-175-389/+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 devQt Forward Merge Bot2018-07-162-1/+4
|\| | | | | | | | | | | | | | | Conflicts: src/quick/items/qquickloader.cpp tests/auto/quick/qquickanimations/tst_qquickanimations.cpp Change-Id: I0cb9f637d24ccd0ecfb50c455cc210119f744b02
| * Fix items in layouts not being rendered when layers are usedMitch Curtis2018-07-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A layer effect is apparently considered a child item of the layout that manages the item, and this causes issues when layouting. As was done for positioners in 865b4ec8, exclude any items for which QQuickItemPrivate::isTransparentForPositioner() returns true from layouting. As that commit made QQuickItemLayer set it to true when the layer is enabled, QQuickShaderEffectSource will be excluded from layouting. Task-number: QTBUG-63269 Change-Id: I463ff8d0cea0dfd6c4273f376de347971040d3d0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| * Update plugins.qmltypes for WindowMarco Benelli2018-07-021-1/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-20696 Change-Id: Id67a53dd7dd4ed841228cccf16876d2be446ceab Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Prefix vtable methods with virtualLars Knoll2018-07-031-4/+4
| | | | | | | | | | | | | | | | | | Turns out that the overloading of vtable methods and regular ones is problematic in some cases. So let's rather make it explicit which methods are part of the vtable, and which aren't. Change-Id: Ifee32a26104d30f3c82bca8b5a9cdea2d4f4f526 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Replace Identifier by PropertyKeyLars Knoll2018-07-021-2/+2
| | | | | | | | | | | | | | | | Change all uses of Identifier to use the new PropertyKey class and get rid of Identifier. Change-Id: Ib7e83b06a3c923235e145b6e083fe980dc240452 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Unify the get and getIndexed vtable functions of QV4::ObjectLars Knoll2018-07-021-4/+8
| | | | | | | | | | | | | | | | This finalizes the refactoring of Object's vtable API. Also added the receiver argument to the method as required by the ES7 spec. Change-Id: I36f9989211c47458788fe9f7e929862bcfe7b845 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Add defaultLogLevel to LoggingCategoryTomasz Olszak2018-06-251-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | Add possibility to define default logging category log level. Just like in QLoggingCategory constructor. [ChangeLog][QML Elements][LoggingCategory] Added defaultLogLevel property. It is possible to define default log level that LoggingCategory is enabled for. Task-number: QTBUG-67094 Change-Id: I12557dfb7c228c40b325d0dccde4c525acae0300 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | Merge "Merge remote-tracking branch 'origin/5.11' into dev" into ↵Liang Qi2018-06-254-8/+8
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/5.11' into devUlf Hermann2018-06-254-8/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp src/quick/handlers/qquickhandlerpoint.cpp src/quick/handlers/qquicksinglepointhandler.cpp tests/auto/qml/ecmascripttests/test262 Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca
| | * Doc: Correct QML type for FolderListModel.folderPaul Wicking2018-06-211-4/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-68940 Change-Id: I439ec9b6253815f41e405a0d9f79ff69eb75c98e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Doc: Add missing dots (qtdeclarative)Paul Wicking2018-06-193-4/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: Ibb5aa227e82825085e7214e17dcffcb17fd44157 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Add Proxy support for prototype handlingLars Knoll2018-06-251-4/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup get/setPrototypeOf and fix some smaller incompatibilities in the default implementation for Object. Add the methods to the vtable and reimplement them according to spec for ProxyObjects. Clean up the Object.prototype.get/setPrototypeOf/__proto__ methods and fix a smaller bug in the Reflect API for those methods. Change-Id: I6e438753332ec4db963d6cdcf86f340ff212777a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Move QtQuick.Shapes implementation to qtquickshapes, privately exportedPaolo Angelelli2018-06-2131-6317/+7
| | | | | | | | | | | | | | | | | | | | | | This change moves the implementation of QtQuick.Shapes into an own qt module, where classes are privately exported. In this way Shapes QML types can be internally (= from other Qt modules) instantiated also from cpp. Change-Id: I428f981f0a1f3083e6571cbeaffa706fd8ef7254 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Add value/setValue apiDmitriy Yatmanov2018-05-152-0/+36
| | | | | | | | | | | | | | | | You can set/read value in imperative way, and with key not connected to property. Change-Id: I97a7b1cb3d36a58b64563cb6c511b4bc56731acb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Don't save built-in properties if there aren't any qml propertiesDmitriy Yatmanov2018-05-141-0/+4
| | | | | | | | | | | | | | | | Add property offset check otherwise QQmlSettings properties will be written to QSettings. Change-Id: Ib8cd49e41fdf7b21f44866d57d884a92442bd228 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add possibility to read INI fileDmitriy Yatmanov2018-05-145-6/+46
| | | | | | | | | | | | | | | | Add fileName property so we can choose specific settings file. Task-number: QTBUG-59507 Change-Id: Iedd59eb703a8d00e7f0a6824dde929de5924b451 Reviewed-by: J-P Nurmi <jpnurmi@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>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-05-0213-105/+11
| | | | | | | | | | | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: I7275029bd4c15eda6bb8c2ab7ae8c1cd3933aedb Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
* | 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>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-2118-33/+99
|\| | | | | | | Change-Id: Ibeba10bc821a01125a485df48a0bc88c45c01a73
| * Update builtins.qmltypesKai Koehne2018-04-201-2/+37
| | | | | | | | | | Change-Id: I2e08061ff7d084b08d1fb6d857dc6fb985c66a48 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Document latest QtQuick.Test import version to be 2.11Kai Koehne2018-04-201-1/+1
| | | | | | | | | | | | | | | | | | Since commit 214fbaa57b73296a0 the latest minor version of the import is automatically the Qt minor version, so let's also document this. Change-Id: Ie2fe1d172898bd0d51f0841c078abd1f8ab8d744 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Document latest QtQuick.Layouts import to be 2.11Kai Koehne2018-04-201-1/+1
| | | | | | | | | | | | | | | | | | Since commit 214fbaa57b73296a0 the latest minor version of the import is automatically the Qt minor version, so let's also document this. Change-Id: I4131a399cca7c66b0e9df549f14be43eeaa94af3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Document latest QtQuick.Particles import version to be 2.11Kai Koehne2018-04-201-1/+1
| | | | | | | | | | | | | | | | | | Since commit 214fbaa57b73296a0 the latest minor version of the import is automatically the Qt minor version, so let's also document this. Change-Id: I9443be62da5cc9fc281e167f38fa299c73115eda Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Document latest QtQml.StateMachine import version to be 2.11Kai Koehne2018-04-202-2/+2
| | | | | | | | | | | | | | | | | | Since commit 214fbaa57b73296a0 the latest minor version of the import is automatically the Qt minor version, so let's also document this. Change-Id: I61a1015d74beaeac9d7a2aecd73e3f05c8a545c9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Document latest QtQuick.XmlListModule import version to be 2.11Kai Koehne2018-04-202-3/+3
| | | | | | | | | | | | | | | | | | Since commit 214fbaa57b73296a0 the latest minor version of the import is automatically the Qt minor version, so let's also document this. Change-Id: I4ed5d3e08d718ebb6cf15f97806c18b8aa514e1c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Document latest QtQuick.Window version to be 2.11Kai Koehne2018-04-202-3/+3
| | | | | | | | | | | | | | | | | | Since commit 214fbaa57b73296a0 the latest minor version of the import is automatically the Qt minor version, so let's also document this. Change-Id: I5ba3c5947262e7fab5df3bfcc05d2282234dafcc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Document latest QtQml.Models import version to be 2.11Kai Koehne2018-04-203-4/+13
| | | | | | | | | | | | | | | | | | Since commit 214fbaa57b73296a0 the latest minor version of the import is automatically the Qt minor version, so let's also document this. Change-Id: Ife465afc101d400b47e9f98c58cac3894224da00 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Document latest QtQuick.LocalStorage version to be 2.11Kai Koehne2018-04-203-3/+3
| | | | | | | | | | | | | | | | | | Since commit 214fbaa57b73296a0 the latest minor version of the import is automatically the Qt minor version, so let's also document this. Change-Id: If0b8a0daecc62d191a9c5efd450ec0f5214ee387 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update plugins.qmltypes for QtQuickKai Koehne2018-04-192-13/+35
| | | | | | | | | | Change-Id: I5d2019c079a5e28b7fd8bfcb1ed63e5a5e3fe956 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-181-0/+1
|\| | | | | | | Change-Id: I4a9c7802c180757e70fa4dd16df3287104a088bc
| * QQuickShapeGenericRenderer: Fix clang-cl-warning about uninitialized variableFriedemann Kleint2018-04-121-0/+1
| | | | | | | | | | | | | | | | | | Add a return to the default branch capturing NoGradient, fixing: warning: variable 'gradMat' is used uninitialized whenever switch default is taken Change-Id: Iad9d619b59677a18a0718d750516c9b2fe51569d Reviewed-by: Laszlo Agocs <laszlo.agocs@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>
* | Disambiguate different allocation functions in the memory managerLars Knoll2018-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | Some compilers (in this case MingW 5.3) don't manage to properly disambiguate the template overloads, and try to instantiate the wrong template function. Solve this by renaming the one of the template functions. Change-Id: I3574e617fe96c4bd52920a0127a1dfe39cc3d302 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | QQuickTableView: add new class: QQuickTableViewRichard Moe Gustavsen2018-04-125-1/+114
| | | | | | | | | | | | Task-number: QTBUG-51710 Change-Id: I8827a9c80bfa1ed3b9116c7625b74e3c5b12bfce Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-121-1/+1
|\| | | | | | | Change-Id: I50759e6601b02f87e07083a64fca23e0f4e23ca7
| * Fix plugins.qmltypes for QtQml installation in static buildsSimon Hausmann2018-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Mention plugins.qmltypes in AUX_QML_FILES to ensure that it is always copied to the build directory. qml_module.prf usually takes care of this by having QML_FILES in qmldir.files with INSTALLS += qmldir, but with CONFIG += builtin_resources (set for static) that's not the case. AUX_QML_FILES is the correct variable though. Task-number: QTBUG-67600 Change-Id: I4291b942e14ca26749758c3511240f824288f07e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 20:15:11 +0000