aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Fix no-widgets buildAlexandru Croitor2020-10-211-2/+2
| | | | | | Task-number: QTBUG-86053 Change-Id: If58d5b69ed58ae1aa3d50737683e682d70c26c23 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* CMake: Disable usage of CMake API compatibility wrappersAlexandru Croitor2020-10-061-0/+5
| | | | | | | | | Setting the QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS variable in the project ensures we ported away from old API calls. Task-number: QTBUG-86815 Change-Id: I3d80bf0ffcfe765472b2cd01ffc43d3af04d0261 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake: Regenerate qtdeclarative/srcAlexandru Croitor2020-05-291-1/+2
| | | | | | | | | | Includes - renaming of internal plugin api call - generation of QT_QMLTYPES_FILENAME - addition of a few TARGET_DESCRIPTION Change-Id: I72b5647b8c16af9945795ead62a075322b6bb2f6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Add optional dependency on OpenGLWidgetsAlexandru Croitor2020-03-161-1/+1
| | | | | | | | Needed for some benchmarks. Change-Id: I795112bd795bd230fb4852e0aab466547bf56cb2 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate and adapt to merge from devwip/cmakeAlexandru Croitor2020-03-121-2/+14
| | | | | | Change-Id: If8daa6152a563d4309d7342414780ef75b9f5589 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
* Move OpenGL to optional componentSamuli Piippo2020-02-051-2/+2
| | | | | | | | Parts of declarative is still buildable without OpenGL Change-Id: If76be1eaca03a4754d1d6a86c3d8fba3329bc773 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Post-merge fixesAlexandru Croitor2020-01-301-2/+2
| | | | | Change-Id: I2350df5368ee34d6c7072d456806e518ce533839 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add qt6_add_qml_module() public APILeander Beernaert2019-09-191-0/+3
| | | | | | | | | | | | | | Add qt6_add_qml_module() as a public API for building QML modules. Since the shared implementation details are small, it was easier to just reimplement the shared code than to unmangle the more complicated version we use to build Qt from QtBuild. This patch includes an example conversion. Changes for pro2cmake will follow in a separate patch in qtbase. Change-Id: I942526cc7d978e2d8309b506e785f9c1509d0bbc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix top-level build with examples enabledSimon Hausmann2019-09-171-1/+1
| | | | | | | | | | | | | | | | | One of our examples depends on QtQuickTest, which has a public dependency to QtTest. So the example does find_package(Qt6 COMPONENTS QuickTest), which will end up calling find_dependency(QtTest). The Qt6Test cmake config files will import the module's feature, which requires the Qt6::Test target to exist. That however was not created because we set the QT_NO_CREATE_TARGETS. So if we set that (which is correct), then we do need to find Qt6::Test at the top-level. Other modules shouldn't need this as they don't create modules that in turn have a public dependency to testlib. Change-Id: Ia82aaa2b2462feec81659c6e532d0a185e6819a6 Done-with: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Support standalone tests buildingLiang Qi2019-09-021-2/+3
| | | | | | | Also fix some build issues regarding tests. Change-Id: Ie9ba8a0b7932ae2b542614b6c824c4071ad0b548 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Bump minimum CMake version to 3.15.0 as it is done in qtbaseAlexandru Croitor2019-08-271-1/+1
| | | | | | | | | We decided this in a workshop a while ago, where we noticed that the find_dependency() macro was broken in regards to finding additional components. 3.15.0 was the version that fixed it. Change-Id: Icdb161c983aea4f61fe705856428e5c3d443c05f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add QtDeclarative Test CoverageLeander Beernaert2019-08-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | All tests compile and run on a developer build. These tests are failing: tst_qqmlsqldatabase Fails due to missing sql driver tst_qqmlsqldatabase Fails in wip/qt6 tst_ququicklayouts Fails in wip/qt6 tst_flickableinterop Fails in wip/qt6 tst_qquickpinchandler Fails in wip/qt6 tst_qquickflickable Fails in wip/qt6 tst_qquickgridview Fails in wip/qt6 tst_qquickimage Fails due to missing jpeg plugin tst_qquicklistview Fails in wip/qt6 tst_qquicktext Fails in wip/qt6 tst_qquickcanvasitem Fails in wip/qt6 tst_scenegraph Fails due to missing jpeg plugin tst_TestFiltering Fails in wip/qt6 Change-Id: I4b9d69c118e23c095cb72ad5a67653fc30943bb1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: switch version to 6.0.0Frederik Gladhorn2019-06-171-2/+2
| | | | | Change-Id: I633338f4d75f48213019b3b88fe1b6402c6005fd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Initial CMake portAlexandru Croitor2019-06-031-0/+11
Crude port of QtQml, QtQmlModels, QtQuick and a few tests and a few examples. Task-number: QTBUG-74136 Change-Id: I5de4d8215b33d1a4a72c2c0e7951e4b384f27e3e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 13:37:56 +0000