diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-11-21 15:58:20 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2012-11-22 12:04:41 +0100 |
commit | eb56924aaaf46510d85fe217b98d1b5ee618553e (patch) | |
tree | 4cd3333a2c6de078b569ec48f60a3fb6ae3eae26 /src/app/shared | |
parent | 7e007a8e65ff3fcc1f37cc316df874bfceb1f9db (diff) |
setup-qt: adjust to changes in Qt 5
The mkspecs/default symlink (directory on Windows) went away in Qt5.
The qt.core module gets the property mkspecPath that holds the full path
to the mkspec.
Change-Id: Ic47abed642dadbd017fdbac45726ec51fb6cb5ca
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/app/shared')
-rw-r--r-- | src/app/shared/specialplatformssetup.cpp | 2 | ||||
-rw-r--r-- | src/app/shared/specialplatformssetup.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/app/shared/specialplatformssetup.cpp b/src/app/shared/specialplatformssetup.cpp index 842173d05..7423edeb1 100644 --- a/src/app/shared/specialplatformssetup.cpp +++ b/src/app/shared/specialplatformssetup.cpp @@ -192,7 +192,7 @@ void SpecialPlatformsSetup::writeConfigFile(const PlatformInfo &platformInfo, settings.setValue(QLatin1String("libPath"), platformInfo.sysrootDir + QLatin1String("/usr/lib")); settings.setValue(QLatin1String("incPath"), platformInfo.qtIncDir); - settings.setValue(QLatin1String("mkspecsPath"), platformInfo.qtMkspecsDir); + settings.setValue(QLatin1String("mkspec"), platformInfo.qtMkspecPath); settings.setValue(QLatin1String("namespace"), QString()); settings.setValue(QLatin1String("libInfix"), QString()); settings.endGroup(); diff --git a/src/app/shared/specialplatformssetup.h b/src/app/shared/specialplatformssetup.h index d53a13bb1..38ce6cbd5 100644 --- a/src/app/shared/specialplatformssetup.h +++ b/src/app/shared/specialplatformssetup.h @@ -59,7 +59,7 @@ public: QString sysrootDir; QString qtBinDir; QString qtIncDir; - QString qtMkspecsDir; + QString qtMkspecPath; QHash<QString, QString> environment; }; |