aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/builtins
Commit message (Collapse)AuthorAgeFilesLines
* 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>