aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmldevtools/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Regenerate and adapt to merge from devwip/cmakeAlexandru Croitor2020-03-121-1/+1
| | | | | | Change-Id: If8daa6152a563d4309d7342414780ef75b9f5589 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
* Regenerate projects to handle private deps correctlyAlexandru Croitor2020-02-051-3/+1
| | | | | | Change-Id: Ifcbab0407e93dfc35d0459d7d29dee2cd3508a86 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix include paths of QmlDevTools[Private] for framework buildsJoerg Bornemann2020-01-071-11/+30
| | | | | | Change-Id: Ifd0d1751f3532773e9258189d4a2e930a41b7625 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Regenerate all projects with new CMake API versionAlexandru Croitor2019-11-151-2/+2
| | | | | | Change-Id: Ie0db35f674137c229eaf049616f38f8e818f7092 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate projectsAlexandru Croitor2019-11-141-2/+1
| | | | | | Change-Id: I38044c382e4d84b5865a19cdd04cc8922bd72a77 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix up qlalr calls in preparation for API change in qtbaseSimon Hausmann2019-10-151-1/+1
| | | | | | | The target should come first, for consistency. Change-Id: I305781c119883189852fc5299522766bed90f09b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Regenerate qtdeclarative before mergeAlexandru Croitor2019-10-111-6/+5
| | | | | | Change-Id: I5710110679220c4e22bc7f8b540f18a51b735ddf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Fix handling of QmlDevTools include headersAlexandru Croitor2019-09-101-0/+7
| | | | | | | | | | | | | When doing a prefix build, standalone tests need to include the QmlDevTools headers. This means that the installed headers need to be passed via INSTALL_INTERFACE genex, for prefix build case, and via BUILD_INTERFACE for non-prefix build case. Change-Id: I0d2a993e1ec0205e5b2a2d25e1e09e719e28a059 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Qt CMake Build Bot
* Support standalone tests buildingLiang Qi2019-09-021-0/+1
| | | | | | | Also fix some build issues regarding tests. Change-Id: Ie9ba8a0b7932ae2b542614b6c824c4071ad0b548 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix parallel buildSimon Hausmann2019-07-291-0/+9
| | | | | | | | | | | When the parallel build tries to build QmlQmlDevTools early on (can be triggered directly via ninja /path/to/lib/libQt6QmlDevTools.a), then we must make sure to build QtQml first, due to the dependency on syncqt generated header files, which in turn include build time generated files. Change-Id: I5a4ac01d48a791e2ee951e8dd5b418d989e4643c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-07-241-7/+25
| | | | Change-Id: I52b2d17d9334313e4b3d84b52432f2ebc77f7415
* Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-07-111-3/+3
| | | | Change-Id: I2963c1209316fb6755f572969f368970450d7991
* Fix declarative buildAlexandru Croitor2019-06-171-3/+3
| | | | | | | | | | | | - qmltest examples should not be built for now (there's no ported CMakeLists.txt file) - when building QmlDevTools, qml_module_include_dir should only be included during building, because those are build directory paths. - QmlTest was missing some private dependencies to find private includes Change-Id: I22a77cd46f82bc61ab84aa7bc4c9d0e38a9d603a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Port the declarative toolsAlexandru Croitor2019-06-081-5/+23
| | | | | | | | | Also fix up QmlDevTools module to not depend on QtQml, but instead make it include the headers / cpp files as it is done in the qmake project. Change-Id: I240c52d5357db150a7c0c819892fb0a3708ceee4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* More porting of declarative modulesAlexandru Croitor2019-06-081-0/+69
Change-Id: Ibe6d87998af1209518af87117b79778136110786 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>