Qt 6.1.0: Use QTDIR in Conan profiles for Qt path

There's an established environment variable for this: QTDIR.
This environment variable is also set by Qt Creator by default.
So the Conan recipes should accept this environment variable.

Apply this change for upcoming Add-on/Qt releases i.e. 6.1.0 onwards.

Task-number: QTBUG-90583
Change-Id: Ib37adaa5dc3ee1945290743bbd1a18bd71f87797
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

9 files changed, 9 insertions, 9 deletions

diff --git a/profiles/qt/android/6.1.0/qt-6.1.0-android-armeabi-v7a b/profiles/qt/android/6.1.0/qt-6.1.0-android-armeabi-v7a
index 70ea79a..b5de2a3 100644
--- a/profiles/qt/android/6.1.0/qt-6.1.0-android-armeabi-v7a
+++ b/profiles/qt/android/6.1.0/qt-6.1.0-android-armeabi-v7a
@@ -10,4 +10,4 @@
 qt6=6.1.0
 [build_requires]
 [env]
-QT_PATH=%QT_VERSION_PATH%/android_armv7
+QTDIR=%QT_VERSION_PATH%/android_armv7
diff --git a/profiles/qt/android/6.1.0/qt-6.1.0-android-armv64_v8a b/profiles/qt/android/6.1.0/qt-6.1.0-android-armv64_v8a
index 21091d6..9426b81 100644
--- a/profiles/qt/android/6.1.0/qt-6.1.0-android-armv64_v8a
+++ b/profiles/qt/android/6.1.0/qt-6.1.0-android-armv64_v8a
@@ -10,4 +10,4 @@
 qt6=6.1.0
 [build_requires]
 [env]
-QT_PATH=%QT_VERSION_PATH%/android_arm64_v8a
+QTDIR=%QT_VERSION_PATH%/android_arm64_v8a
diff --git a/profiles/qt/android/6.1.0/qt-6.1.0-android-x86 b/profiles/qt/android/6.1.0/qt-6.1.0-android-x86
index 8923fc1..f1c615f 100644
--- a/profiles/qt/android/6.1.0/qt-6.1.0-android-x86
+++ b/profiles/qt/android/6.1.0/qt-6.1.0-android-x86
@@ -10,4 +10,4 @@
 qt6=6.1.0
 [build_requires]
 [env]
-QT_PATH=%QT_VERSION_PATH%/android_x86
+QTDIR=%QT_VERSION_PATH%/android_x86
diff --git a/profiles/qt/android/6.1.0/qt-6.1.0-android-x86_64 b/profiles/qt/android/6.1.0/qt-6.1.0-android-x86_64
index f36ba18..622e2cc 100644
--- a/profiles/qt/android/6.1.0/qt-6.1.0-android-x86_64
+++ b/profiles/qt/android/6.1.0/qt-6.1.0-android-x86_64
@@ -10,4 +10,4 @@
 qt6=6.1.0
 [build_requires]
 [env]
-QT_PATH=%QT_VERSION_PATH%/android_x86_64
+QTDIR=%QT_VERSION_PATH%/android_x86_64
diff --git a/profiles/qt/linux/6.1.0/qt-6.1.0-gcc-x86_64 b/profiles/qt/linux/6.1.0/qt-6.1.0-gcc-x86_64
index 2966143..5c0d88e 100644
--- a/profiles/qt/linux/6.1.0/qt-6.1.0-gcc-x86_64
+++ b/profiles/qt/linux/6.1.0/qt-6.1.0-gcc-x86_64
@@ -9,5 +9,5 @@
 qt6=6.1.0
 [build_requires]
 [env]
-QT_PATH=%QT_VERSION_PATH%/gcc_64
+QTDIR=%QT_VERSION_PATH%/gcc_64
 
diff --git a/profiles/qt/macos/6.1.0/qt-6.1.0-macx-clang b/profiles/qt/macos/6.1.0/qt-6.1.0-macx-clang
index c37b38d..03b15d7 100644
--- a/profiles/qt/macos/6.1.0/qt-6.1.0-macx-clang
+++ b/profiles/qt/macos/6.1.0/qt-6.1.0-macx-clang
@@ -9,5 +9,5 @@
 qt6=6.1.0
 [build_requires]
 [env]
-QT_PATH=%QT_VERSION_PATH%/clang_64
+QTDIR=%QT_VERSION_PATH%/clang_64
 
diff --git a/profiles/qt/macos/6.1.0/qt-6.1.0-macx-ios b/profiles/qt/macos/6.1.0/qt-6.1.0-macx-ios
index 2e132c0..3bcdaa9 100644
--- a/profiles/qt/macos/6.1.0/qt-6.1.0-macx-ios
+++ b/profiles/qt/macos/6.1.0/qt-6.1.0-macx-ios
@@ -10,5 +10,5 @@
 qt6=6.1.0
 [build_requires]
 [env]
-QT_PATH=%QT_VERSION_PATH%/ios
+QTDIR=%QT_VERSION_PATH%/ios
 
diff --git a/profiles/qt/windows/6.1.0/qt-6.1.0-mingw81_64 b/profiles/qt/windows/6.1.0/qt-6.1.0-mingw81_64
index d0b01db..e442304 100644
--- a/profiles/qt/windows/6.1.0/qt-6.1.0-mingw81_64
+++ b/profiles/qt/windows/6.1.0/qt-6.1.0-mingw81_64
@@ -13,5 +13,5 @@ qt6=6.1.0
 [env]
 CC=gcc
 CXX=g++
-QT_PATH=%QT_VERSION_PATH%\mingw81_64
+QTDIR=%QT_VERSION_PATH%\mingw81_64
 
diff --git a/profiles/qt/windows/6.1.0/qt-6.1.0-msvc2019_64 b/profiles/qt/windows/6.1.0/qt-6.1.0-msvc2019_64
index 59fe7e2..d812994 100644
--- a/profiles/qt/windows/6.1.0/qt-6.1.0-msvc2019_64
+++ b/profiles/qt/windows/6.1.0/qt-6.1.0-msvc2019_64
@@ -8,6 +8,6 @@
 qt6=6.1.0
 [build_requires]
 [env]
-QT_PATH=%QT_VERSION_PATH%\msvc2019_64
+QTDIR=%QT_VERSION_PATH%\msvc2019_64
 CONAN_CMAKE_GENERATOR=Ninja