To resolve the conflicts, the stuff in /tests/qmltests/plugins/ needs to be moved to /tests/mocks/
« Back to merge proposal
To resolve the conflicts, the stuff in /tests/ qmltests/ plugins/ needs to be moved to /tests/mocks/