aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Update plugins.qmltypes for Qt.labs.settingsKai Koehne2019-02-221-6/+3
| | | | | | | | | | Update got necessary after b7b384658b21e741f9a1fde60b1c1ee69a83e278 went in. Task-number: QTBUG-73239 Change-Id: Ic93bbcf5be7f0f33d36b254b3ca30526b86c858c Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Doc: elaborate on default values for Layout.alignmentMitch Curtis2019-02-191-1/+5
| | | | | | | | | | | It wasn't clear which values would be used when only a horizontal or vertical flag was set. Change-Id: I99b4a13a87b35a74f1ab80c5fafa9df621bf7b10 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit a484ea0d3666b57bb49e9284ff86af3ba87ce58b) Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Remove revisions from Qt.labs.settings methods and propertiesPaolo Angelelli2019-01-304-13/+10
| | | | | | | | | | Qt.labs plugins should always have revision 1.0 until they graduate. However, keeping registration Qt.labs.location 1.1 to prevent source incompatibilities. Fixes: QTBUG-73239 Change-Id: I01c66c5d3054fb95df54988b7ce6535ccc65d3a6 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* TestLib: Remove outdated note from TestCase.mouseDragJoerg Bornemann2019-01-221-3/+0
| | | | | | | | | | | | | | The docs of TestCase::mouseDrag say "Note: this method does not imply a drop action, to make a drop, an additional mouseRelease(item, x + dx, y + dy) is needed." However, you can find that exact line at the end of the function. This commit removes this note and amends 73131271. Change-Id: I601ed441e23e9ed66a08fd0f1d23ff5bbb5bc091 Fixes: QTBUG-72954 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-11-1615-1672/+93
|\ | | | | | | Change-Id: I7623438dde316ae1e97802f91991f2e7ccc205a5
| * Update plugins.qmltypesKai Koehne2018-11-145-54/+48
| | | | | | | | | | | | | | Change-Id: I4357377c0c9dc1f5935ea9293da3f54f7f289b02 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * Fix copyright header of wavefrontmesh pluginKai Koehne2018-11-093-15/+45
| | | | | | | | | | | | | | | | Change copyright of files introduced in 4207940684b5784 from GPL to LGPL. Change-Id: Id2aba2b97f6079a92411d1c448bbee0e03b26d95 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * Move xmllistmodel to xmlpatternsv5.12.0-beta4Frederik Gladhorn2018-11-057-1603/+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>
* | Qt Quick Test: support tags filter on tests runKirill Burtsev2018-11-152-19/+54
| | | | | | | | | | | | | | | | Implemented logic for filtering tests with 'case::function:tag' run syntax. Fixes: QTBUG-71645 Change-Id: I9243636b098b4e9ccb4c74d08679bbbb9f3e8a65 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix TestCase::skip to ignore rest of the data rows in TestCaseKirill Burtsev2018-11-071-0/+1
| | | | | | | | | | | | | | Fixes: QTBUG-53131 Change-Id: Ic24fe4b5db0e404b1b089a054ce76265763f2682 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Remove misleading Q_UNUSED(uri)Nazar Gerasymchuk2018-11-055-5/+0
|/ | | | | | | | Several implementations of registerTypes method contains misleading Q_UNUSED(uri) but actually uri is used in it. Change-Id: I34faf4f15cd0f1b60c76f077cdbe5af631d4c8e1 Reviewed-by: Simon Hausmann <simon.hausmann@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>
* Merge remote-tracking branch 'origin/5.11' into 5.12.0Liang Qi2018-10-302-4/+30
|\ | | | | | | | | | | | | | | | | Conflicts: src/imports/settings/qqmlsettings.cpp src/quick/items/qquickwindow.cpp tools/qmlplugindump/main.cpp Change-Id: I3e5dae4de25b2da961a572b3a4bd151181d211c9
| * Doc: place more importance on not binding to x/y/width/heightMitch Curtis2018-10-171-4/+8
| | | | | | | | | | | | | | | | | | | | It's common for users to bind to these properties and think that it's a bug that it doesn't work, so we should make the note in the docs more strongly worded and elaborate a bit. Change-Id: I82c8d5644ed81cc616a3035f489344a491ea5a66 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Qt Labs Settings: warn if failed to initialize internal QSettings instanceMitch Curtis2018-10-111-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, warn the user that the QSettings instance failed to initialize if there was an error. Then, if the error was QSettings::AccessError, print the specific application identifiers that weren't set so they know what they have to do. For example: QML Settings: Failed to initialize QSettings instance. Status code is: 1 QML Settings: The following application identifiers have not been set: QVector("organizationName", "organizationDomain") In my case, the QSettings instance wasn't created on Windows because organizationName wasn't set. Change-Id: I7970209e09b78f785730422c45978775311b96ac Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* | Add WavefrontMeshEskil Abrahamsen Blomfeldt2018-10-257-1/+901
| | | | | | | | | | | | | | | | 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>
* | FolderListModel: use header initialization; fix pedantic warningsv5.12.0-beta3Shawn Rutledge2018-10-192-26/+14
| | | | | | | | | | | | | | | | | | | | That is, initialize variables in the private class where they are defined, and move the padding warning out of that section (now it says the whole class is padded to the alignment boundary, but there's not much we can do about that). Change-Id: I63101b6a837c69265c73b4c6001f1901fcaa8572 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Add sortCaseSensitive property so the sorting can ignore the caseAndy Shaw2018-10-194-1/+36
| | | | | | | | | | | | | | Change-Id: Id308272cc59eca8c95f1386db8cd64f266124579 Fixes: QTBUG-48757 Fixes: QTBUG-70212 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-10-011-0/+2
|\| | | | | | | | | | | | | Conflicts: src/quick/items/qquickevents_p_p.h Change-Id: I8c699aeb46903e2ea80a97a346cb5af460859a98
| * Add QT_CONFIG(filesystemwatcher) guard for includeLiang Qi2018-10-011-0/+2
| | | | | | | | | | | | | | | | This is needed by 555a6b5d in qtbase. Change-Id: I4c8379c2db704f7d7f2f9a933b062285dd9d8e26 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Cleanups in Value/PrimitiveLars Knoll2018-09-171-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Get rid of Primitive and move the corresponding methods directly into Value. Mark many methods in Value as constexpr and turn Value into a POD type again. Keep Primitive as a pure alias to Value for source compatibility of other modules that might be using it. Change-Id: Icb47458947dd3482c8852e95782123ea4346f5ec Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Doc: Use a macro to resolve the QML import versionTopi Reinio2018-09-145-28/+32
| | | | | | | | | | | | | | | | | | | | | | QDoc now supports macros for its command parameters, as well as passing parameters to \code and \qml commands. Use these together with the new \QtMinorVersion macro to automate bumping the QML import versions within documentation. Task-number: QTBUG-67818 Change-Id: I8b5300749880421a0d7cdacc1b2c0f96b3b7ef67 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | 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