Commit 1a35a716 authored by Marco Bubke's avatar Marco Bubke
Browse files

QmlDesigner: Support Qt4 again



Task-number: QTCREATORBUG-12567
Change-Id: I5a6b7c4ca31f20d25301cc6fc19a549ce895c0b4
Reviewed-by: default avatarTim Jenssen <tim.jenssen@digia.com>
parent 9b2557de
......@@ -426,13 +426,18 @@ bool PuppetCreator::checkQmlpuppetIsReady() const
return checkPuppetIsReady(qmlpuppetPath(UserSpacePuppet));
}
static bool nonEarlyQt5Version(const QtSupport::QtVersionNumber &currentQtVersionNumber)
{
return currentQtVersionNumber >= QtSupport::QtVersionNumber(5, 2, 0) || currentQtVersionNumber < QtSupport::QtVersionNumber(5, 0, 0);
}
bool PuppetCreator::qtIsSupported() const
{
QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitInformation::qtVersion(m_kit);
if (currentQtVersion
&& currentQtVersion->isValid()
&& currentQtVersion->qtVersion() >= QtSupport::QtVersionNumber(5, 2, 0)
&& nonEarlyQt5Version(currentQtVersion->qtVersion())
&& (currentQtVersion->type() == QLatin1String(QtSupport::Constants::DESKTOPQT)
|| currentQtVersion->type() == QLatin1String(QtSupport::Constants::SIMULATORQT)))
return true;
......
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