diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2021-02-15 09:18:25 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@qt.io> | 2021-02-15 07:56:58 +0000 |
| commit | e6082417d4a37439ff43cee32ac4883489e4d85d (patch) | |
| tree | 49e496934fd29192a6b6a8929db019f1db1b9bb8 /profiles/qt/windows/6.1.0/qt-6.1.0-msvc2019_64 | |
| parent | 3cc12c69fb7e6b7a84d80e89a680efdba7bd4383 (diff) | |
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>
Diffstat (limited to 'profiles/qt/windows/6.1.0/qt-6.1.0-msvc2019_64')
| -rw-r--r-- | profiles/qt/windows/6.1.0/qt-6.1.0-msvc2019_64 | 2 |
1 files changed, 1 insertions, 1 deletions
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 |