Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix conflict between two Settings classes. Required to launch example. Change-Id: I9b98e0b79f84f905f92a7042f2bf7aab4a34d225 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
- Loading branch information