diff options
| author | Nikunj Arora <[email protected]> | 2025-05-20 12:05:57 +0300 |
|---|---|---|
| committer | Nikunj Arora <[email protected]> | 2025-05-23 15:21:35 +0300 |
| commit | 4a1cb0e6271f1fe7adbd706a11cceb0131d91429 (patch) | |
| tree | 07f07f8a7aa0e341107c8ba329de10161aeccff3 | |
| parent | 6c803d9a7cc0f5e795d31ab565b97c02e1a3d81e (diff) | |
Since we are going to deprecate QtBuild extension, we can improve the
naming of properties, such as qtKitDir to qtAbiPath as it makes more
sense.
Pick-to: 1.3
Task-number: QTTA-140
Change-Id: If15b06430ddc2df21b47ad2cd7f377c368f964d2
Reviewed-by: Olli Vuolteenaho <[email protected]>
Reviewed-by: Petri Virkkunen <[email protected]>
| -rw-r--r-- | src/doc/src/qt-gradle-plugin-topics.qdoc | 4 | ||||
| -rw-r--r-- | src/main/groovy/org/qtproject/qt/gradleplugin/QtGradlePlugin.groovy | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/doc/src/qt-gradle-plugin-topics.qdoc b/src/doc/src/qt-gradle-plugin-topics.qdoc index 0ec9271..0410b8e 100644 --- a/src/doc/src/qt-gradle-plugin-topics.qdoc +++ b/src/doc/src/qt-gradle-plugin-topics.qdoc @@ -271,7 +271,7 @@ Other properties are optional and explained below: - \section1 Optional: Qt kit directory + \section1 Optional: Qt ABI directory By default, this is not defined, and Multi-ABIs will be built. If this path is defined, then a build will be done for that kit ABI only. @@ -281,7 +281,7 @@ \tab {qtgradle-snippets-qtKitDir}{tab-groovy-qtKitDir}{Groovy}{} \tabcontent {tab-properties-qtKitDir} \badcode \minqtpatchversion - qt.kitDir=/home/username/qt/build/your-qt-kit + qt.abiPath=/home/username/qt/build/your-qt-kit \endcode \endtabcontent \tabcontent {tab-kotlin-qtKitDir} diff --git a/src/main/groovy/org/qtproject/qt/gradleplugin/QtGradlePlugin.groovy b/src/main/groovy/org/qtproject/qt/gradleplugin/QtGradlePlugin.groovy index 7a4c852..7aa733a 100644 --- a/src/main/groovy/org/qtproject/qt/gradleplugin/QtGradlePlugin.groovy +++ b/src/main/groovy/org/qtproject/qt/gradleplugin/QtGradlePlugin.groovy @@ -21,7 +21,7 @@ class QtGradlePlugin implements Plugin<Project> { def gradleProperties = [ "qt.path": findProperty("qt.path", project), - "qt.kitDir": findProperty("qt.kitDir", project), + "qt.abiPath": findProperty("qt.abiPath", project), "qt.projectPath": findProperty("qt.projectPath", project), "qt.ninjaPath": findProperty("qt.ninjaPath", project), "qt.extraCMakeArguments": findProperty("qt.extraCMakeArguments", project) @@ -30,7 +30,7 @@ class QtGradlePlugin implements Plugin<Project> { def buildTask = project.tasks.register('QtBuildTask', QtBuildTask) { qtPath = gradleProperties["qt.path"] ? Utils.getAbsolutePath(gradleProperties["qt.path"], project) : extension.qtPath - qtKitDir = gradleProperties["qt.kitDir"] ? Utils.getAbsolutePath(gradleProperties["qt.kitDir"], project) + qtKitDir = gradleProperties["qt.abiPath"] ? Utils.getAbsolutePath(gradleProperties["qt.abiPath"], project) : extension.qtKitDir projectPath = gradleProperties["qt.projectPath"] ? Utils.getAbsolutePath(gradleProperties["qt.projectPath"], project) : extension.projectPath |