diff options
author | Eike Ziller <eike.ziller@qt.io> | 2018-05-28 16:07:00 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-28 16:07:00 +0200 |
commit | c1c57f0c383f88451d1b6c8fe83caa6f2f071048 (patch) | |
tree | 6eaeb663e6332f3071c15f4fc1eafe48924204aa /src/plugins/qtsupport/baseqtversion.cpp | |
parent | bae61e08ea670aa083b9bc76e7744f0240fba423 (diff) | |
parent | d8caa228ea614f3afa8bd453a5dcf4d692c6d312 (diff) |
Merge remote-tracking branch 'origin/4.6' into 4.7
Change-Id: Ifddceb06f377ea428300fa8a48908cfc44b98705
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.cpp')
-rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 34e4ef20e3..af6cdcb44a 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1813,9 +1813,8 @@ bool BaseQtVersion::isQtQuickCompilerSupported(QString *reason) const return false; } - const QString qtQuickCompilerExecutable = - HostOsInfo::withExecutableSuffix(binPath().toString() + "/qtquickcompiler"); - if (!QFileInfo::exists(qtQuickCompilerExecutable)) { + const QString qtQuickCompilerPrf = mkspecsPath().toString() + "/features/qtquickcompiler.prf"; + if (!QFileInfo::exists(qtQuickCompilerPrf)) { if (reason) *reason = QCoreApplication::translate("BaseQtVersion", "This Qt Version does not contain Qt Quick Compiler."); return false; |