aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/builtins
Commit message (Collapse)AuthorAgeFilesLines
* QmlCompiler: Fix resolution of method and property typesUlf Hermann2020-11-181-1/+6
| | | | | | | | | | | | | | | | We need to resolve the types for QML elements in two passes because only after finishing the parsing we have the QML-declared methods and properties available. We already need the base type before, though. Also, there can be multiple methods of the same name. We need API to access them. It also turns out that the internal name of the "var" type has to be QVariant in order to match reality. "var" properties and unnamed arguments to JS functions are implemented as QVariant. Change-Id: I541f11e96db72d832f4e4443d3a5d31079a56575 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Change internal name of "var" type to QJSValueUlf Hermann2020-11-111-16/+17
| | | | | | | This is in line with what it's called in other qmltypes files. Change-Id: Ic2266cf5253c488cf93509548b4f2f26f2aae661 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Use "QString" as internal name for string type in builtinsUlf Hermann2020-11-111-60/+60
| | | | | | | This fits the terminology in other qmltypes files. Change-Id: I4cce9c1f388eba79790d07dfee44a04600fda667 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Formalize declaration of varargs in builtins.qmltypesUlf Hermann2020-10-281-43/+19
| | | | | | | varargs are a special non-exported type. Change-Id: I2cd00d197ee5b4976e683cfe91dc0561a7186541 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Run builtins.qmltypes through qmlformatUlf Hermann2020-10-281-261/+1042
| | | | | Change-Id: I3ee4904cd3d492f71edee5f3b2bc9507df9810d4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Mark basic types as value types in builtins.qmltypesUlf Hermann2020-10-281-0/+5
| | | | | Change-Id: Ibb8c40a3d8af405926769b776807c9e2d47f061e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* builtins.qmltypes: Change real's internal name to "double"Ulf Hermann2020-10-281-79/+84
| | | | | | | | | It's called "double" everywhere else. We also have a "float" type in some places. Add that one. "double" still has an export called "real" as that is what you write in QML files. Change-Id: I4107e28c3441b9f829aca9abcbcbb8c5e3f8d327 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Remove duplicate property assignment from builtins.qmltypesUlf Hermann2020-10-271-1/+1
| | | | | | Change-Id: I0b96cc346ebf6580399f5379882f674073a89c21 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qml: Move more types into builtins.qmltypesMaximilian Goldstein2020-10-261-0/+36
| | | | | Change-Id: Id2795f16af99870f32266f81228890a9d12c86a7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add undefined to builtins.qmltypesUlf Hermann2020-10-161-2/+7
| | | | | Change-Id: Ie7c8a28fdc417c43a9f24061171b342447b15272 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix typoes in builtins.qmltypesUlf Hermann2020-10-161-16/+16
| | | | | | | It's isReadonly, not isReadOnly. Change-Id: Ia4c372468447bd4f6c0ad21ba36a228052912220 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* new builtins.qmltypesFawzi Mohamed2020-08-271-1614/+826
| | | | | | | | | | | manually mantained qmltypes files with the builtintypes (as defined in ECMA-262) This is a best match effort, unfortunately we cannot (yet?) express all the semantic of ECMAScript, but we try to be close to it. Fixes: QTBUG-83815 Change-Id: I0572114ff9f2d5a0855c62def824551cba8be655 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Replace Qt's MidButton with MiddleButtonEdward Welbourne2020-07-221-1/+1
| | | | | | | | | | The latter has been the preferred name since Qt 4.7.0. Added a comment on where the old name is exposed to QML that it's only for backwards compatibility. Pick-to: 5.15 Change-Id: I2c5088d597dd7327cc5899d06afb180d0ec2893e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Don't use qmlplugindump for builtins.qmltypes anymoreUlf Hermann2020-05-193-18/+0
| | | | | | | | | | The current contents of builtins.qmltypes should really be part of QtQml, and builtins.qmltypes should contain actual builtin types instead. qmlplugindump is only run explicitly on "make qmltypes" anyway, it's pointless here. Change-Id: I026fb8b223e5b481cc9150d14dfb0af1aab32b51 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Clean up registration of QEasingCurveUlf Hermann2020-05-191-1/+0
| | | | | | | | | | | | | | | | We don't need to register the Type enum for both QtQml and QtQuick. QtQml is enough. Removing this makes the whole manual value type registration obsolete. Furthermore, we want QEasingCurve as QML_FOREIGN as we have several classes with properties of that type. To keep it nice and tidy, we make the uppercase-named enum holder class a separate type. Unfortunately, the Type enums differ in one entry: QEasingCurve::BezierSpline is called Easing.Bezier in QML. Therefore, we need to keep the custom enum around. We can change all users in qtdeclarative to use the name from QEasingCurve, though. Change-Id: Ibbc78d8bbf8938e2a8722f8c09833a0c73394c3d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* CMake: Copy builtins.qmltypes to QML import path in non-prefix buildsUlf Hermann2020-04-141-1/+2
| | | | | | | | | | | Previously the file was copied to qtdeclarative/src/builtins due to a missing QT_INSTALL_DIR. Now it will be copied to qtbase_built/qml. Change-Id: Icb392559c749b1a460763ac986269053d8050f0f Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add MatchRegularExpression flagLars Knoll2020-03-201-0/+1
| | | | | | | | This is there to stay consistent with C++, where MatchRegExp is deprecated and will in Qt6 be an alias to MatchRegularExpression. Change-Id: Ibbb0885dddebaba3464e93cc6a0d05e94c01f4e1 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-141-0/+11
|\ | | | | | | | | | | | | Removed dependencies.yaml because we don't use it yet in wip/cmake. Fixed conflict in qmlcachegen.cpp. Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922
| * Update plugins.qmltypes for 5.14Kai Koehne2019-09-261-0/+11
| | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: Iaee681cc10ae33c582806900a041d79bc0cc8d1d Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-10-111-2/+11
|\| | | | | | | Change-Id: I4a91928610f79c8e21a05781953ffa41508c828a
| * Regenerate plugins.qmltypesUlf Hermann2019-08-261-2/+11
| | | | | | | | | | | | Change-Id: I9e470d08ee93c44663e6f99cebe7817c90cba3e4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Update qml modulesLeander Beernaert2019-08-011-0/+2
| | | | | | | | | | | | | | | | Updated qml modules to be compatible with the latest changes to add_qml_modules. Change-Id: I3342a1375bfa64a16fb0c54f812c56bad173f73c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Build projects from src/importAlexandru Croitor2019-07-241-0/+18
|/ | | | | | | | | | Add support to build the projects under src/imports. All the CMakeLists.txt were generate with pro2cmake, except for src/imports/builtins. Change-Id: I06046ede82ba5b1e677e92b7548f543d020b0354 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-131-2/+2
| | | | | | | | Task-number: QTBUG-73484 Change-Id: I089f5122817a4da1fce13f55d2975240d741b9f6 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update plugins.qmltypesKai Koehne2018-09-061-2/+4
| | | | | | | | | | | | | 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>
* Update builtins.qmltypesKai Koehne2018-04-201-2/+37
| | | | | Change-Id: I2e08061ff7d084b08d1fb6d857dc6fb985c66a48 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* QmlJs: update plugins.qmltypesMarco Benelli2017-12-141-1/+4
| | | | | Change-Id: I3df1210088f877d4fe1d7953982e0fd2fa6ad3db Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Update qmltypesMarco Benelli2017-05-231-1/+2
| | | | | | | | Small update of qmltypes. Change-Id: I5408f0ae50a70ca1c1cc0c0deaa8ddf6458c88c1 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Update plugins.qmltypes for 5.9Marco Benelli2017-03-131-2/+30
| | | | | Change-Id: I5e6dbd2012718890f5fcc92beebcd1829dc53a57 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Update .qmltypesMarco Benelli2016-09-121-9/+16
| | | | | | | | | | Update qmltypes for 5.8. For some files the -noforceqtquick option is used; in this way there are no redundand definitions of QtQuick component and no unneded dependencies from QtQuick. Change-Id: Id29683fcd6d15056923867ea65b091f998297fc4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* make use of COPIESOswald Buddenhagen2016-05-131-14/+1
| | | | | Change-Id: I479c9523a89be1d64364e8205daa5860e16882cc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* move builtins.qmltypes to an own subdirOswald Buddenhagen2016-05-132-0/+1637
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 12:11:39 +0000