summaryrefslogtreecommitdiffstats
path: root/src/quick3d/imports/scene2d
Commit message (Collapse)AuthorAgeFilesLines
* Update plugins.qmltypesv5.12.0-beta2Kai Koehne2018-10-092-69/+28
| | | | | | | | | | | | | | | by running for path in `find . -name "Makefile*" -print`; do pushd `dirname $path`; make -f `basename $path` qmltypes; popd; done in the build directory. Fixes: QTBUG-64035 Fixes: QTBUG-69259 Task-number: QTBUG-70264 Change-Id: Ib36a8e66121c310dee28b84953ca381e231139cf Reviewed-by: Christian Stromme <christian.stromme@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Automatically register the latest import versionKai Koehne2018-09-062-1/+4
| | | | | | | | | | | | | | | This follows what was done in d28c9f6a for Qt Quick Controls 2. The latest import version (e.g. 2.11 in Qt 5.11) will automatically be registered whenever the Qt version is bumped. This avoids needing to wait until a new type is added (or a new revision is added to an existing type) before being able to use the newest Qt Quick version. Task-number: QTBUG-70290 Change-Id: Id221b5879f8c50a20fe5e26f9e141b82e4a196cb Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove the code to manually initialize resources in static buildsSimon Hausmann2018-05-081-8/+1
| | | | | | | | | | 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: I04a1430720da6ae55fafad04253c23a25a2532cd Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-251-1/+1
| | | | | Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add plugins.qmltypes file for scene2dMäättä Antti2017-04-121-0/+121
| | | | | | | | Add plugins.qmltypes file for scene2d for tooling Task-number: QTBUG-60100 Change-Id: I23376960f6cdedd099006ad89132e7e4904e6588 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* scene2d: Add qcoreapplication.h to header includesMikko Gronoff2017-03-201-0/+1
| | | | | | | Required for Q_COREAPP_STARTUP_FUNCTION macro Change-Id: Icaa66a7f3aa206bf4741a086c75f3d7b79b7af6d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* cleanup scene2d - change mouse event handlingAntti Määttä2017-03-032-2/+3
| | | | | | Task-number: QTBUG-58876 Change-Id: I103125ff15a4b28a67832eb7b86b1abbd2f3fde8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move scene2d to own module and implement conditional plugin loadingAntti Määttä2017-02-284-0/+140
- Add quick3dscene2d module - Add importsscene2d qml module - Modify RenderAspect to load plugins conditionally - change autotests to match the module change Change-Id: If6596472acbd9a377561b2bfd2094a0585c781ac Reviewed-by: Antti Määttä <antti.maatta@qt.io>