Commit e95bf19e authored by Kai Koehne's avatar Kai Koehne Committed by hjk

QmlDump: Fix status message / tooltip if executable is missing in 4.8

We displayed "Cannot be compiled" if no qmlplugindump is found in 4.8,
which is somewhat misleading.

Change-Id: Iec61fd714d7644bf202a3fcce86a6c89395019b6
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent da647ad6
......@@ -875,6 +875,12 @@ bool BaseQtVersion::hasQmlDump() const
return m_hasQmlDump;
}
bool BaseQtVersion::needsQmlDump() const
{
updateVersionInfo();
return qtVersion() < QtVersionNumber(4, 8, 0);
}
bool BaseQtVersion::hasQmlDebuggingLibrary() const
{
updateVersionInfo();
......
......@@ -202,6 +202,7 @@ public:
virtual bool hasGdbDebuggingHelper() const;
virtual bool hasQmlDump() const;
virtual bool needsQmlDump() const;
virtual bool hasQmlDebuggingLibrary() const;
virtual bool needsQmlDebuggingLibrary() const;
virtual bool hasQmlObserver() const;
......
......@@ -692,6 +692,7 @@ void QtOptionsPageWidget::updateDebuggingHelperUi()
const bool hasGdbHelper = !version->gdbDebuggingHelperLibrary().isEmpty();
const bool hasQmlDumper = version->hasQmlDump();
const bool needsQmlDumper = version->needsQmlDump();
const bool hasQmlDebuggingLib = version->hasQmlDebuggingLibrary();
const bool needsQmlDebuggingLib = version->needsQmlDebuggingLibrary();
const bool hasQmlObserver = !version->qmlObserverTool().isEmpty();
......@@ -760,7 +761,9 @@ void QtOptionsPageWidget::updateDebuggingHelperUi()
}
qmlDumpStatusTextFlags = Qt::TextSelectableByMouse;
} else {
if (canBuildQmlDumper) {
if (!needsQmlDumper) {
qmlDumpStatusText = tr("<i>Not needed.</i>");
} else if (canBuildQmlDumper) {
qmlDumpStatusText = tr("<i>Not yet built.</i>");
} else {
qmlDumpStatusText = tr("<i>Cannot be compiled.</i>");
......
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