summaryrefslogtreecommitdiffstats
path: root/coin
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Enable enforcing CI testsAlexandru Croitor2020-08-131-1/+1
| | | | | | | | | | Any failing tests in CMake configurations will now prevent integrations to go through in this repository. Task-number: QTBUG-84886 Change-Id: Ibe030945e20256a3e985f552a45b14c3a594ee51 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/wip/cmake' into devAlexandru Croitor2020-04-011-0/+27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjusted xcomposite-glx to link against X11. Added latest Coin instructions, plus some additional logic to skip some platforms where building wayland does not make sense. Otherwise Coin will fail on those platforms when trying to extract artifacts that don't exist. Conflicts: coin/module_config.yaml src/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pri src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt Change-Id: I2383b0826ece841f3862f396516f402390aa42be
| * Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-261-0/+12
| |\ | |/ |/| | | Change-Id: Ia76896a4d06240ccc3d95ba478b6ce273c7a0be2
| * Initial CMake portJohan Klokkhammer Helsing2019-11-261-0/+26
| | | | | | | | | | | | | | | | The client, compositor, tests, plugins and examples now build. There are still a few minor issues: - The protocol source generation is a bit hacky. - The tests for checking if building CMake projects don't work anymore as they have Qt 5 specific code. They have just been commented out for now. Fixes: QTBUG-78177 Change-Id: Ie17cb05f0cdbd5b098970ce765adaeccf61a8fde Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* Coin: Make sure lib/libQt5WaylandCompositor.so gets split outJohan Klokkhammer Helsing2019-11-061-0/+1
| | | | | | Task-number: COIN-349 Change-Id: I62a888a72948dfb15d6210a6ede39d2fdde30f21 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Add configuration file to help the coin ExportTool to split the contentv5.14.0-beta3Simon Hausmann2019-11-051-0/+11
By default all files shall be in the base package, but additional packages can be specified in the top-level object by name along with python glob.glob compatible masks. Task-number: COIN-349 Change-Id: Ic0e2bae67d7c8a596f249ce527bb58c0a50d7ab2 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>