Commit 3cb6c233 authored by Eike Ziller's avatar Eike Ziller Committed by hjk

Fix showing of "Debugging Helper Missing" warning.

It was only showing up if one had a helper library that was outdated.

Change-Id: I8d0ffcd16434dc6cfeadd408a2bdb59aa3ec73ba
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 91b79844
...@@ -251,7 +251,7 @@ QStringList CMakeRunConfiguration::dumperLibraryLocations() const ...@@ -251,7 +251,7 @@ QStringList CMakeRunConfiguration::dumperLibraryLocations() const
{ {
QString qmakePath = ProjectExplorer::DebuggingHelperLibrary::findSystemQt(environment()); QString qmakePath = ProjectExplorer::DebuggingHelperLibrary::findSystemQt(environment());
QString qtInstallData = ProjectExplorer::DebuggingHelperLibrary::qtInstallDataDir(qmakePath); QString qtInstallData = ProjectExplorer::DebuggingHelperLibrary::qtInstallDataDir(qmakePath);
return ProjectExplorer::DebuggingHelperLibrary::locationsByInstallData(qtInstallData); return ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData);
} }
Utils::Environment CMakeRunConfiguration::baseEnvironment() const Utils::Environment CMakeRunConfiguration::baseEnvironment() const
......
...@@ -2483,7 +2483,7 @@ void DebuggerPluginPrivate::showMessage(const QString &msg, int channel, int tim ...@@ -2483,7 +2483,7 @@ void DebuggerPluginPrivate::showMessage(const QString &msg, int channel, int tim
void DebuggerPluginPrivate::showQtDumperLibraryWarning(const QString &details) void DebuggerPluginPrivate::showQtDumperLibraryWarning(const QString &details)
{ {
QMessageBox dialog(mainWindow()); QMessageBox dialog(mainWindow());
QPushButton *qtPref = dialog.addButton(tr("Open Qt4 Options"), QPushButton *qtPref = dialog.addButton(tr("Open Qt Options"),
QMessageBox::ActionRole); QMessageBox::ActionRole);
QPushButton *helperOff = dialog.addButton(tr("Turn off Helper Usage"), QPushButton *helperOff = dialog.addButton(tr("Turn off Helper Usage"),
QMessageBox::ActionRole); QMessageBox::ActionRole);
......
...@@ -332,7 +332,7 @@ QStringList CustomExecutableRunConfiguration::dumperLibraryLocations() const ...@@ -332,7 +332,7 @@ QStringList CustomExecutableRunConfiguration::dumperLibraryLocations() const
{ {
QString qmakePath = ProjectExplorer::DebuggingHelperLibrary::findSystemQt(environment()); QString qmakePath = ProjectExplorer::DebuggingHelperLibrary::findSystemQt(environment());
QString qtInstallData = ProjectExplorer::DebuggingHelperLibrary::qtInstallDataDir(qmakePath); QString qtInstallData = ProjectExplorer::DebuggingHelperLibrary::qtInstallDataDir(qmakePath);
return ProjectExplorer::DebuggingHelperLibrary::locationsByInstallData(qtInstallData); return ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData);
} }
ProjectExplorer::Abi CustomExecutableRunConfiguration::abi() const ProjectExplorer::Abi CustomExecutableRunConfiguration::abi() const
......
...@@ -68,18 +68,6 @@ QStringList DebuggingHelperLibrary::debuggingHelperLibraryDirectories(const QStr ...@@ -68,18 +68,6 @@ QStringList DebuggingHelperLibrary::debuggingHelperLibraryDirectories(const QStr
return directories; return directories;
} }
QStringList DebuggingHelperLibrary::locationsByInstallData(const QString &qtInstallData)
{
QStringList result;
QFileInfo fileInfo;
const QStringList binFilenames = validBinaryFilenames();
foreach(const QString &directory, debuggingHelperLibraryDirectories(qtInstallData)) {
if (getHelperFileInfoFor(binFilenames, directory, &fileInfo))
result << fileInfo.filePath();
}
return result;
}
static QString sourcePath() static QString sourcePath()
{ {
return Core::ICore::instance()->resourcePath() + QLatin1String("/dumper/"); return Core::ICore::instance()->resourcePath() + QLatin1String("/dumper/");
......
...@@ -47,7 +47,7 @@ class PROJECTEXPLORER_EXPORT DebuggingHelperLibrary : public Utils::BuildableHel ...@@ -47,7 +47,7 @@ class PROJECTEXPLORER_EXPORT DebuggingHelperLibrary : public Utils::BuildableHel
{ {
public: public:
static QString debuggingHelperLibraryByInstallData(const QString &qtInstallData); static QString debuggingHelperLibraryByInstallData(const QString &qtInstallData);
static QStringList locationsByInstallData(const QString &qtInstallData); static QStringList debuggingHelperLibraryDirectories(const QString &qtInstallData);
// Build the helpers and return the output log/errormessage. // Build the helpers and return the output log/errormessage.
static bool build(BuildHelperArguments arguments, QString *log, QString *errorMessage); static bool build(BuildHelperArguments arguments, QString *log, QString *errorMessage);
...@@ -55,8 +55,6 @@ public: ...@@ -55,8 +55,6 @@ public:
// Copy the source files to a target location and return the chosen target location. // Copy the source files to a target location and return the chosen target location.
static QString copy(const QString &qtInstallData, QString *errorMessage); static QString copy(const QString &qtInstallData, QString *errorMessage);
private:
static QStringList debuggingHelperLibraryDirectories(const QString &qtInstallData);
}; };
} // namespace ProjectExplorer } // namespace ProjectExplorer
......
...@@ -955,7 +955,7 @@ QStringList BaseQtVersion::debuggingHelperLibraryLocations() const ...@@ -955,7 +955,7 @@ QStringList BaseQtVersion::debuggingHelperLibraryLocations() const
QString qtInstallData = versionInfo().value("QT_INSTALL_DATA"); QString qtInstallData = versionInfo().value("QT_INSTALL_DATA");
if (qtInstallData.isEmpty()) if (qtInstallData.isEmpty())
return QStringList(); return QStringList();
return ProjectExplorer::DebuggingHelperLibrary::locationsByInstallData(qtInstallData); return ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData);
} }
bool BaseQtVersion::supportsBinaryDebuggingHelper() const bool BaseQtVersion::supportsBinaryDebuggingHelper() const
......
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