Commit 8db0a1b6 authored by Ulf Hermann's avatar Ulf Hermann

Remove QtQuick1 debugging option from build & run settings

We don't need to support QtQuick1 anymore. Consequently, the
minimum Qt version for QML debugging is bumped to 5.0.0.

Change-Id: I9528de3f6869fb391eaf9560a148e03f6067b9de
Reviewed-by: default avatarDaniel Teske <daniel.teske@theqtcompany.com>
parent b83ac9cc
......@@ -190,11 +190,6 @@ void MakeFileParse::parseAssignments(QList<QMakeAssignment> *assignments)
m_config.osType = QMakeStepConfig::IphoneOS;
else
m_config.osType = QMakeStepConfig::NoOsType;
} else if (value == QLatin1String("declarative_debug")) {
if (qa.op == QLatin1String("+="))
m_config.linkQmlDebuggingQQ1 = true;
else
m_config.linkQmlDebuggingQQ1 = false;
} else if (value == QLatin1String("qml_debug")) {
if (qa.op == QLatin1String("+="))
m_config.linkQmlDebuggingQQ2 = true;
......@@ -329,7 +324,6 @@ MakeFileParse::MakeFileParse(const QString &makefile)
qCDebug(logging()) << " Explicit NoBuildAll" << m_qmakeBuildConfig.explicitNoBuildAll;
qCDebug(logging()) << " TargetArch" << m_config.archConfig;
qCDebug(logging()) << " OsType" << m_config.osType;
qCDebug(logging()) << " LinkQmlDebuggingQQ1" << m_config.linkQmlDebuggingQQ1;
qCDebug(logging()) << " LinkQmlDebuggingQQ2" << m_config.linkQmlDebuggingQQ2;
qCDebug(logging()) << " Qt Quick Compiler" << m_config.useQtQuickCompiler;
qCDebug(logging()) << " Separate Debug Info" << m_config.separateDebugInfo;
......
......@@ -670,8 +670,7 @@ void QmakeBuildConfigurationFactory::configureBuildConfiguration(Target *parent,
if (!additionalArguments.isEmpty())
qmakeStep->setUserArguments(additionalArguments);
if (!qmakeInfo->makefile.isEmpty())
qmakeStep->setLinkQmlDebuggingLibrary(qmakeInfo->config.linkQmlDebuggingQQ1
|| qmakeInfo->config.linkQmlDebuggingQQ2);
qmakeStep->setLinkQmlDebuggingLibrary(qmakeInfo->config.linkQmlDebuggingQQ2);
qmakeStep->setSeparateDebugInfo(qmakeInfo->config.separateDebugInfo);
qmakeStep->setUseQtQuickCompiler(qmakeInfo->config.useQtQuickCompiler);
......
......@@ -169,11 +169,8 @@ QMakeStepConfig QMakeStep::deducedArguments()
config.archConfig = QMakeStepConfig::targetArchFor(targetAbi, version);
config.osType = QMakeStepConfig::osTypeFor(targetAbi, version);
if (linkQmlDebuggingLibrary() && version) {
config.linkQmlDebuggingQQ1 = true;
if (version->qtVersion().majorVersion >= 5)
config.linkQmlDebuggingQQ2 = true;
}
if (linkQmlDebuggingLibrary() && version && version->qtVersion().majorVersion >= 5)
config.linkQmlDebuggingQQ2 = true;
if (useQtQuickCompiler() && version)
config.useQtQuickCompiler = true;
......@@ -868,8 +865,6 @@ QStringList QMakeStepConfig::toArguments() const
else if (osType == IphoneOS)
arguments << QLatin1String("CONFIG+=iphoneos");
if (linkQmlDebuggingQQ1)
arguments << QLatin1String("CONFIG+=declarative_debug");
if (linkQmlDebuggingQQ2)
arguments << QLatin1String("CONFIG+=qml_debug");
......
......@@ -96,7 +96,6 @@ public:
// Actual data
TargetArchConfig archConfig = NoArch;
OsType osType = NoOsType;
bool linkQmlDebuggingQQ1 = false;
bool linkQmlDebuggingQQ2 = false;
bool useQtQuickCompiler = false;
bool separateDebugInfo = false;
......@@ -104,8 +103,8 @@ public:
inline bool operator ==(const QMakeStepConfig &a, const QMakeStepConfig &b) {
return std::tie(a.archConfig, a.osType, a.linkQmlDebuggingQQ1, a.linkQmlDebuggingQQ2)
== std::tie(b.archConfig, b.osType, b.linkQmlDebuggingQQ1, b.linkQmlDebuggingQQ2)
return std::tie(a.archConfig, a.osType, a.linkQmlDebuggingQQ2)
== std::tie(b.archConfig, b.osType, b.linkQmlDebuggingQQ2)
&& std::tie(a.useQtQuickCompiler, a.separateDebugInfo)
== std::tie(b.useQtQuickCompiler, b.separateDebugInfo);
}
......@@ -116,7 +115,7 @@ inline bool operator !=(const QMakeStepConfig &a, const QMakeStepConfig &b) {
inline QDebug operator<<(QDebug dbg, const QMakeStepConfig &c)
{
dbg << c.archConfig << c.osType << c.linkQmlDebuggingQQ1 << c.linkQmlDebuggingQQ2 << c.useQtQuickCompiler << c.separateDebugInfo;
dbg << c.archConfig << c.osType << c.linkQmlDebuggingQQ2 << c.useQtQuickCompiler << c.separateDebugInfo;
return dbg;
}
......
......@@ -1604,9 +1604,9 @@ bool BaseQtVersion::isQmlDebuggingSupported(QString *reason) const
return false;
}
if (qtVersion() < QtVersionNumber(4, 8, 0)) {
if (qtVersion() < QtVersionNumber(5, 0, 0)) {
if (reason)
*reason = QCoreApplication::translate("BaseQtVersion", "Requires Qt 4.8.0 or newer.");
*reason = QCoreApplication::translate("BaseQtVersion", "Requires Qt 5.0.0 or newer.");
return false;
}
......
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