aboutsummaryrefslogtreecommitdiffstats
path: root/.cmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionJani Heikkinen2021-02-221-1/+1
| | | | Change-Id: Ied020f53f8052ff1f25fc63b9e04fa90bdf76250
* Update QtAndroidExtras version number to 6.1.0 and update dependenciesAndreas Buhr2021-02-151-1/+1
| | | | | | | | | QtAndroidExtras is still at version 6.0.0. This patch updates to 6.1.0 and does the required update of dependencies. Change-Id: I02fd3de1786be9dcfbaac8f384a1f17755adbc0d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Skip building android extras when we're not configured for androidMÃ¥rten Nordheim2020-06-091-0/+1
Breaks top-level build. Also regenerate the top-level CMakeLists.txt in general Change-Id: Id01bd5e003e8233f02c28f737fbfbc960276fa42 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>