Commit b1d5169b authored by Fawzi Mohamed's avatar Fawzi Mohamed

Revert "qmljs: fix compilation with Qt4 (attempt 2)"

moving original patch to master

This reverts commit 24c020baf00f0ccc3c8319da1261d6748d5a39b7

Change-Id: Iab24b97c058483d6d1dfbd557bf635ef3e102512
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 76d8a41d
......@@ -120,9 +120,7 @@ ModelManagerInterface::ProjectInfo QmlJSTools::defaultProjectInfoForProject(
projectInfo.qtImportsPath = qtVersion->qmakeProperty("QT_INSTALL_IMPORTS");
projectInfo.qtVersionString = qtVersion->qtVersionString();
} else {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
projectInfo.qtQmlPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
#endif
projectInfo.qtImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath);
projectInfo.qtVersionString = QLatin1String(qVersion());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment