aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | testlib: Support regular expression ignores in ignoreMessageRobin Burchell2018-04-091-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | This is a feature C++ has that the QML side lacked. [ChangeLog][Qt Quick Test][TestCase] ignoreWarning now supports ignoring regular expressions as well as strings. Task-number: QTBUG-47111 Change-Id: If3b7b78365e60f1d8d276050ba7e00fac43400e1 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-03-229-3/+30
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/qml/configure.json src/qml/qml/qqmlengine.cpp src/qml/types/qqmlmodelsmodule.cpp src/qml/types/types.pri Change-Id: I390112f8178c99b36741d3c40901e544c6daafaa
| * add qmlRegisterModule to all QML plugins (QUIP 99)Shawn Rutledge2018-03-218-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it should always be possible to do import QtQuick.Module x.m where x is the module's major version and m is Qt's minor version. [ChangeLog][QtQuick][Important Behavior Changes] In Qt 5.11 and newer versions, QML plugin modules are available with the same minor version as the Qt release minor version number. For example it's possible to import QtQuick.Window 2.11 or import QtQuick.Layouts 1.11 even though there haven't been any API changes in these modules for Qt 5.11, and the maximum possible import version will automatically increment in future Qt versions. This is intended to reduce confusion. Change-Id: I0d28ed04d186bcdd5acde95b8ed0b66c1c4697e3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Simplify handling of function expressions as signal handlersMichael Brasser2018-03-211-7/+0
| | | | | | | | | | Change-Id: I4bfa05b4619c248119c78d05e64270e6627f6065 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Handle function expressions in SignalTransitionMichael Brasser2018-03-211-3/+11
| | | | | | | | | | | | | | | | Extend 22b13921f8067f8a93164875a4ad59bed85b0400 to SignalTransition. Change-Id: Ic7d03353efaa7ba894b913e5b0bc193d648d21df Task-number: QTBUG-50328 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-035-28/+33
|\| | | | | | | Change-Id: I308b964d86ca01916f6af7d6e3f71557e3624eca
| * doc: Fix one link commandMartin Smith2018-03-021-1/+1
| | | | | | | | | | | | | | This update fixes a \l command that used the wrong syntax. Change-Id: Icf5cc82eb4118332b42fe67d9d31bb7de07de3fc Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Doc: correct references to snippetNico Vertriest2018-02-281-6/+28
| | | | | | | | | | | | | | | | | | - replace by \quotefromfile statements from existing code - if no example in existing code: use \badcode - this makes dbransaction.js redundant Change-Id: I748fd1b3ee564556d71e9af5ca2dbc70ec37ecc2 Reviewed-by: Martin Smith <martin.smith@qt.io>
| * doc: Remove duplicate qdoc commentMartin Smith2018-02-281-17/+0
| | | | | | | | | | | | | | | | | | \qmlmodule Qt.labs.handlers 1.0 appeared twice. This one is being removed because it was older and less complete than the other one, which can be seen in qtquickhandlers.qdoc. Change-Id: Id4866eec8c61a2f30920edb661edb1e6bd3fddb5 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * use the override keyword consistently and correctly (clang-tidy)Shawn Rutledge2018-02-273-4/+4
| | | | | | | | | | Change-Id: If9e28d143f8cba3df3c757476b4f2265e2eb8b2a Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-02-2727-51/+46
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4engine.cpp src/qml/jsruntime/qv4internalclass.cpp src/qml/parser/qqmljslexer.cpp src/qml/qml/v8/qv8engine.cpp src/qml/util/qqmladaptormodel_p.h src/quick/items/qquickanimatedsprite.cpp tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp Change-Id: I16702b7a0da29c2a332afee47728d6a6ebf4fb3f
| * init variables where they are declared when possible (clang-tidy)Shawn Rutledge2018-02-262-10/+5
| | | | | | | | | | | | | | | | clang-tidy -p compile_commands.json $file -checks='-*,modernize-use-default-member-init,readability-redundant-member-init' -config='{CheckOptions: [{key: modernize-use-default-member-init.UseAssignment, value: "1"}]}' -header-filter='qtdeclarative' -fix Change-Id: I705f3235ff129ba68b0d8dad54a083e29fcead5f Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * use nullptr consistently (clang-tidy)Shawn Rutledge2018-02-2626-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-221-0/+1
|\| | | | | | | Change-Id: I8cca650fbb1904ecba59da909a08dba3cc574add
| * QuickTest: declare a missing QtQuick.Window dependencyJ-P Nurmi2018-02-211-0/+1
| | | | | | | | | | | | | | | | | | Since fdb8226, TestCase.qml imports QtQuick.Window 2.0. The dependency must be explicitly declared in static builds. Change-Id: Ia7d3d19573e2c5b49a21d7b833830d29b5ea4f55 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-201-2/+3
|\| | | | | | | Change-Id: I7b98beb61f73a74b80cf80a49b63819aa6eb528e
| * Layout: improve warning message when anchors are detectedMitch Curtis2018-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | - Use the more explicit term "manage" to make it clear that the warning only applies to items that are direct children of a layout type. - Instruct users towards the proper way to position items within a layout: Layout.alignment. Change-Id: Id13af95457a689e41aeaead1f9a0f958f095fca9 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 23:25:02 +0000