diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2018-05-15 17:36:45 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2018-05-16 11:39:14 +0000 |
| commit | 850a35aae5b9854e1490e68fa5ee1277ff7332db (patch) | |
| tree | 0dc34f77d1ab13888b3d8ed5b1e485888b736d89 | |
| parent | 23ac1d18e1be8d898adf44dde745ba7c259beb3c (diff) | |
QtSupport: Improve the qtquickcompiler feature detection
Check for qtquickcompiler.prf instead of for the binary. That is
compatible with (commercial) Qt < 5.11 with the original
qtquickcompiler, and now additionally with Qt >= 5.11 with qmlcachegen.
Task-number: QTCREATORBUG-19993
Change-Id: Ie0ba30a590828f13b330a62acb9d1d5c84a5916b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -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 12941ee0d2..289409fc08 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1815,9 +1815,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; |