diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index 9e85318461fbbcf02edce1f3491a00744cca0f42..f4026c6aaa53cbee558d14c53cdf388f600281bf 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -156,81 +156,7 @@ QString CMakeManager::qtVersionForQMake(const QString &qmakePath)
return QString();
}
-// this is mostly a copy from qt4versionmanager
-// TODO refactor this code
-// returns QPair< QTDIR, QT_INSTALL_DATA >
-QPair<QString, QString> CMakeManager::findQtDir(const ProjectExplorer::Environment &env)
-{
- QStringList possibleCommands;
- // On windows noone has renamed qmake, right?
-#ifdef Q_OS_WIN
- possibleCommands << "qmake.exe";
-#endif
- // On unix some distributions renamed qmake to avoid clashes
- possibleCommands << "qmake-qt4" << "qmake4" << "qmake";
-
- QStringList paths = env.path();
- foreach (const QString &path, paths) {
- foreach (const QString &possibleCommand, possibleCommands) {
- QFileInfo qmake(path + "/" + possibleCommand);
- if (qmake.exists()) {
- if (!qtVersionForQMake(qmake.absoluteFilePath()).isNull()) {
- QDir qtDir = qmake.absoluteDir();
- qtDir.cdUp();
- QProcess proc;
- proc.start(qmake.absoluteFilePath(), QStringList() << "-query" << "QT_INSTALL_DATA");
- if (proc.waitForFinished()) {
- return qMakePair(qtDir.absolutePath(), QString(proc.readAll().trimmed()));
- } else {
- proc.kill();
- QDir dir(qmake.absoluteDir());
- dir.cdUp();
- return qMakePair(qtDir.absolutePath(), dir.absolutePath());
- }
- }
- }
- }
- }
- return qMakePair(QString(), QString());
-}
-
-// This code is more or less duplicated in qtversionmanager
-QString CMakeManager::findDumperLibrary(const ProjectExplorer::Environment &env)
-{
- static ProjectExplorer::Environment lastenv;
- static QString lastpath;
- if (lastenv == env)
- return lastpath;
-
- QPair<QString, QString> pair = findQtDir(env);
- QString qtInstallDataDir = pair.second;
- if (qtInstallDataDir.isEmpty())
- return QString();
-
- uint hash = qHash(pair.first);
- QStringList directories;
- directories
- << (qtInstallDataDir + "/qtc-debugging-helper/")
- << (QApplication::applicationDirPath() + "/../qtc-debugging-helper/" + QString::number(hash)) + "/"
- << (QDesktopServices::storageLocation(QDesktopServices::DataLocation) + "/qtc-debugging-helper/" + QString::number(hash)) + "/";
- foreach(const QString &directory, directories) {
-#if defined(Q_OS_WIN)
- QFileInfo fi(directory + "debug/gdbmacros.dll");
-#elif defined(Q_OS_MAC)
- QFileInfo fi(directory + "libgdbmacros.dylib");
-#else // generic UNIX
- QFileInfo fi(directory + "libgdbmacros.so");
-#endif
- if (fi.exists()) {
- lastpath = fi.filePath();
- return lastpath;
- }
- }
- lastpath = QString();
- return lastpath;
-}
-
-/////
+////
// CMakeRunner
////
// TODO give a better name, what this class is to update cached information
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index 7f7875c1bdb33509f6c490798e02f04f8a77b288..6e013c77f827f8deffc2b85eaed2072a10d6266c 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -33,6 +33,7 @@
#include "cmakeprojectconstants.h"
#include <projectexplorer/environment.h>
+#include <projectexplorer/debugginghelper.h>
#include <utils/qtcassert.h>
#include <QtGui/QFormLayout>
#include <QtGui/QLineEdit>
@@ -140,7 +141,9 @@ void CMakeRunConfiguration::setArguments(const QString &newText)
QString CMakeRunConfiguration::dumperLibrary() const
{
- return CMakeManager::findDumperLibrary(environment());
+ QString qmakePath = ProjectExplorer::DebuggingHelperLibrary::findSystemQt(environment());
+ QString dhl = ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibrary(qmakePath);
+ return dhl;
}
// Factory
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index ee0c58e0a4c33875acf6f0c35f13a835e23f3703..ff16068c7f605b916b990810a2ae179c638fd82b 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1657,7 +1657,9 @@ void EditorManager::showEditorInfoBar(const QString &kind,
void EditorManager::hideEditorInfoBar(const QString &kind)
{
- currentEditorView()->hideEditorInfoBar(kind);
+ Core::Internal::EditorView *cev = currentEditorView();
+ if (cev)
+ cev->hideEditorInfoBar(kind);
}
void EditorManager::showEditorStatusBar(const QString &kind,
diff --git a/src/plugins/find/findtoolwindow.cpp b/src/plugins/find/findtoolwindow.cpp
index eec831775b576ca4c23db8caa64ba4c43fb8384c..7cab358b90f96412c7e716a0102359166316cda9 100644
--- a/src/plugins/find/findtoolwindow.cpp
+++ b/src/plugins/find/findtoolwindow.cpp
@@ -136,7 +136,7 @@ void FindToolWindow::writeSettings()
{
QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup("Find");
- settings->setValue("CurrentFilter", m_currentFilter->id());
+ settings->setValue("CurrentFilter", m_currentFilter ? 0 : m_currentFilter->id());
foreach (IFindFilter *filter, m_filters)
filter->writeSettings(settings);
settings->endGroup();
diff --git a/src/plugins/projectexplorer/debugginghelper.cpp b/src/plugins/projectexplorer/debugginghelper.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..64a1f3e8cb931dfb68a3fe51d8182074934216ce
--- /dev/null
+++ b/src/plugins/projectexplorer/debugginghelper.cpp
@@ -0,0 +1,223 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+**************************************************************************/
+
+#include "debugginghelper.h"
+#include <coreplugin/icore.h>
+#include <QtCore/QFileInfo>
+#include <QtCore/QHash>
+#include <QtCore/QProcess>
+#include <QtCore/QDir>
+#include <QtCore/QDateTime>
+#include <QtGui/QApplication>
+#include <QtGui/QDesktopServices>
+
+using namespace ProjectExplorer;
+
+QString DebuggingHelperLibrary::findSystemQt(const Environment &env)
+{
+ QStringList paths = env.path();
+ foreach (const QString &path, paths) {
+ foreach (const QString &possibleCommand, possibleQMakeCommands()) {
+ QFileInfo qmake(path + "/" + possibleCommand);
+ if (qmake.exists()) {
+ if (!qtVersionForQMake(qmake.absoluteFilePath()).isNull()) {
+ return qmake.absoluteFilePath();
+ }
+ }
+ }
+ }
+ return QString::null;
+}
+
+bool DebuggingHelperLibrary::hasDebuggingHelperLibrary(const QString &qmakePath)
+{
+ return !debuggingHelperLibrary(qmakePath).isNull();
+}
+
+QStringList DebuggingHelperLibrary::debuggingHelperLibraryDirectories(const QString &qtInstallData, const QString &qtpath)
+{
+ uint hash = qHash(qtpath);
+ QStringList directories;
+ directories
+ << (qtInstallData + "/qtc-debugging-helper/")
+ << (QApplication::applicationDirPath() + "/../qtc-debugging-helper/" + QString::number(hash)) + "/"
+ << (QDesktopServices::storageLocation(QDesktopServices::DataLocation) + "/qtc-debugging-helper/" + QString::number(hash)) + "/";
+ return directories;
+}
+
+QString DebuggingHelperLibrary::debuggingHelperLibrary(const QString &qmakePath)
+{
+ return debuggingHelperLibrary(qtInstallDataDir(qmakePath), qtDir(qmakePath));
+}
+
+QString DebuggingHelperLibrary::qtInstallDataDir(const QString &qmakePath)
+{
+ QProcess proc;
+ proc.start(qmakePath, QStringList() << "-query"<< "QT_INSTALL_DATA");
+ if (proc.waitForFinished())
+ return QString(proc.readAll().trimmed());
+ return QString::null;
+}
+
+QString DebuggingHelperLibrary::qtDir(const QString &qmakePath)
+{
+ QDir dir = QFileInfo(qmakePath).absoluteDir();
+ dir.cdUp();
+ return dir.absolutePath();
+}
+
+// Debugging Helper Library
+
+QString DebuggingHelperLibrary::debuggingHelperLibrary(const QString &qtInstallData, const QString &qtpath)
+{
+ foreach(const QString &directory, debuggingHelperLibraryDirectories(qtInstallData, qtpath)) {
+#if defined(Q_OS_WIN)
+ QFileInfo fi(directory + "debug/gdbmacros.dll");
+#elif defined(Q_OS_MAC)
+ QFileInfo fi(directory + "libgdbmacros.dylib");
+#else // generic UNIX
+ QFileInfo fi(directory + "libgdbmacros.so");
+#endif
+ if (fi.exists())
+ return fi.filePath();
+ }
+ return QString();
+}
+
+
+QString DebuggingHelperLibrary::buildDebuggingHelperLibrary(const QString &qmakePath, const QString &make, const Environment &env)
+{
+ QString directory = copyDebuggingHelperLibrary(qtInstallDataDir(qmakePath), qtDir(qmakePath));
+ return buildDebuggingHelperLibrary(directory, make, qmakePath, QString::null, env);
+ return QString::null;
+}
+
+QString DebuggingHelperLibrary::copyDebuggingHelperLibrary(const QString &qtInstallData, const QString &qtdir)
+{
+ // Locations to try:
+ // $QTDIR/qtc-debugging-helper
+ // $APPLICATION-DIR/qtc-debugging-helper/$hash
+ // $USERDIR/qtc-debugging-helper/$hash
+ QStringList directories = DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData, qtdir);
+
+ QStringList files;
+ files << "gdbmacros.cpp" << "gdbmacros.pro"
+ << "LICENSE.LGPL" << "LGPL_EXCEPTION.TXT";
+ foreach(const QString &directory, directories) {
+ QString dumperPath = Core::ICore::instance()->resourcePath() + "/gdbmacros/";
+ bool success = true;
+ QDir().mkpath(directory);
+ foreach (const QString &file, files) {
+ QString source = dumperPath + file;
+ QString dest = directory + file;
+ QFileInfo destInfo(dest);
+ if (destInfo.exists()) {
+ if (destInfo.lastModified() >= QFileInfo(source).lastModified())
+ continue;
+ success &= QFile::remove(dest);
+ }
+ success &= QFile::copy(source, dest);
+ }
+ if (success)
+ return directory;
+ }
+ return QString::null;
+}
+
+QString DebuggingHelperLibrary::buildDebuggingHelperLibrary(const QString &directory, const QString &makeCommand, const QString &qmakeCommand, const QString &mkspec, const Environment &env)
+{
+ QString output;
+ // Setup process
+ QProcess proc;
+ proc.setEnvironment(env.toStringList());
+ proc.setWorkingDirectory(directory);
+ proc.setProcessChannelMode(QProcess::MergedChannels);
+
+ output += QString("Building debugging helper library in %1\n").arg(directory);
+ output += "\n";
+
+ QString makeFullPath = env.searchInPath(makeCommand);
+ if (!makeFullPath.isEmpty()) {
+ output += QString("Running %1 clean...\n").arg(makeFullPath);
+ proc.start(makeFullPath, QStringList() << "clean");
+ proc.waitForFinished();
+ output += proc.readAll();
+ } else {
+ output += QString("%1 not found in PATH\n").arg(makeCommand);
+ return output;
+ }
+
+ output += QString("\nRunning %1 ...\n").arg(qmakeCommand);
+
+ proc.start(qmakeCommand, QStringList()<<"-spec"<< (mkspec.isEmpty() ? "default" : mkspec) <<"gdbmacros.pro");
+ proc.waitForFinished();
+
+ output += proc.readAll();
+
+ output += "\n";
+ if (!makeFullPath.isEmpty()) {
+ output += QString("Running %1 ...\n").arg(makeFullPath);
+ proc.start(makeFullPath, QStringList());
+ proc.waitForFinished();
+ output += proc.readAll();
+ } else {
+ output += QString("%1 not found in PATH\n").arg(makeCommand);
+ }
+ return output;
+}
+
+QString DebuggingHelperLibrary::qtVersionForQMake(const QString &qmakePath)
+{
+ QProcess qmake;
+ qmake.start(qmakePath, QStringList()<<"--version");
+ if (!qmake.waitForFinished())
+ return false;
+ QString output = qmake.readAllStandardOutput();
+ QRegExp regexp("(QMake version|QMake version:)[\\s]*([\\d.]*)", Qt::CaseInsensitive);
+ regexp.indexIn(output);
+ if (regexp.cap(2).startsWith("2.")) {
+ QRegExp regexp2("Using Qt version[\\s]*([\\d\\.]*)", Qt::CaseInsensitive);
+ regexp2.indexIn(output);
+ return regexp2.cap(1);
+ }
+ return QString();
+}
+
+QStringList DebuggingHelperLibrary::possibleQMakeCommands()
+{
+ // On windows noone has renamed qmake, right?
+#ifdef Q_OS_WIN
+ return QStringList() << "qmake.exe";
+#endif
+ // On unix some distributions renamed qmake to avoid clashes
+ QStringList result;
+ result << "qmake-qt4" << "qmake4" << "qmake";
+ return result;
+}
+
diff --git a/src/plugins/projectexplorer/debugginghelper.h b/src/plugins/projectexplorer/debugginghelper.h
new file mode 100644
index 0000000000000000000000000000000000000000..c949157400a1a808abeebcb5ecfa7b31825556ee
--- /dev/null
+++ b/src/plugins/projectexplorer/debugginghelper.h
@@ -0,0 +1,64 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+**************************************************************************/
+
+#ifndef DEBUGGINGHELPER_H
+#define DEBUGGINGHELPER_H
+
+#include "environment.h"
+#include "projectexplorer_export.h"
+
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+
+namespace ProjectExplorer {
+class PROJECTEXPLORER_EXPORT DebuggingHelperLibrary
+{
+public:
+ // returns the full path to the first qmake, qmake-qt4, qmake4 that has
+ // at least version 2.0.0 and thus is a qt4 qmake
+ static QString findSystemQt(const Environment &env);
+ // returns something like qmake4, qmake, qmake-qt4 or whatever distributions have chosen (used by QtVersion)
+ static QStringList possibleQMakeCommands();
+ // return true if the qmake at qmakePath is qt4 (used by QtVersion)
+ static QString qtVersionForQMake(const QString &qmakePath);
+
+ static bool hasDebuggingHelperLibrary(const QString &qmakePath);
+ static QString debuggingHelperLibrary(const QString &qmakePath);
+ static QString buildDebuggingHelperLibrary(const QString &qmakePath, const QString &make, const Environment &env);
+ static QString debuggingHelperLibrary(const QString &qtInstallData, const QString &qtpath);
+ static QString copyDebuggingHelperLibrary(const QString &qtInstallData, const QString &qtdir);
+ static QString buildDebuggingHelperLibrary(const QString &directory, const QString &makeCommand, const QString &qmakeCommand, const QString &mkspec, const Environment &env);
+private:
+ static QStringList debuggingHelperLibraryDirectories(const QString &qtInstallData, const QString &qtpath);
+ static QString qtInstallDataDir(const QString &qmakePath);
+ static QString qtDir(const QString &qmakePath);
+};
+}
+
+#endif // DEBUGGINGHELPER_H
diff --git a/src/plugins/projectexplorer/environment.cpp b/src/plugins/projectexplorer/environment.cpp
index 541445cf99ed92d855fa307d8a1d416bf4c9100f..e3e5e8e4b88ee3d122f3c165a79ae98f6d0202c2 100644
--- a/src/plugins/projectexplorer/environment.cpp
+++ b/src/plugins/projectexplorer/environment.cpp
@@ -179,7 +179,7 @@ void Environment::clear()
m_values.clear();
}
-QString Environment::searchInPath(QString executable)
+QString Environment::searchInPath(QString executable) const
{
// qDebug()<<"looking for "<<executable<< "in PATH: "<<m_values.value("PATH");
if (executable.isEmpty())
diff --git a/src/plugins/projectexplorer/environment.h b/src/plugins/projectexplorer/environment.h
index 367aee5a8022f7324e7293a70ed12fc36f88aada..e76ccc0cb99ae806cde64a5b2fd84aaadb374801 100644
--- a/src/plugins/projectexplorer/environment.h
+++ b/src/plugins/projectexplorer/environment.h
@@ -83,7 +83,7 @@ public:
Environment::const_iterator constBegin() const;
Environment::const_iterator constEnd() const;
- QString searchInPath(QString executable);
+ QString searchInPath(QString executable) const;
QStringList path() const;
static QStringList parseCombinedArgString(const QString &program);
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index af2289699f94152085c719d4cf2966d3f0f0aac7..ebb6a1000a790436ff1fef914b95340d099547d6 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -56,8 +56,6 @@
#include "session.h"
#include "sessiondialog.h"
#include "buildparserfactory.h"
-#include "qtversionmanager.h"
-#include "qtoptionspage.h"
#include <coreplugin/basemode.h>
#include <coreplugin/coreconstants.h>
@@ -196,11 +194,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
connect(m_buildManager, SIGNAL(tasksChanged()),
this, SLOT(updateTaskActions()));
- m_versionManager = new QtVersionManager();
- addAutoReleasedObject(m_versionManager);
-
- addAutoReleasedObject(new QtOptionsPage());
-
addAutoReleasedObject(new CoreListenerCheckingForRunningBuild(m_buildManager));
m_outputPane = new OutputPane;
@@ -1867,7 +1860,7 @@ void ProjectExplorerPlugin::populateOpenWithMenu()
}
}
}
- m_openWithMenu->setEnabled(anyMatches);
+ m_openWithMenu->setEnabled(anyMatches);
}
void ProjectExplorerPlugin::openWithMenuTriggered(QAction *action)
@@ -1912,9 +1905,4 @@ void ProjectExplorerPlugin::setSession(QAction *action)
m_session->loadSession(session);
}
-QtVersionManager *ProjectExplorerPlugin::qtVersionManager() const
-{
- return m_versionManager;
-}
-
Q_EXPORT_PLUGIN(ProjectExplorerPlugin)
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index b18545a9c39e6775dff3740c621c03874035b8ab..987cb323fb69019c81080ca26ac68bbaf8cc8643 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -64,7 +64,6 @@ class RunConfiguration;
class RunControl;
class SessionManager;
class IRunConfigurationRunner;
-class QtVersionManager;
namespace Internal {
class ApplicationOutput;
@@ -105,8 +104,6 @@ public:
void showContextMenu(const QPoint &globalPos, Node *node);
- QtVersionManager *qtVersionManager() const;
-
//PluginInterface
bool initialize(const QStringList &arguments, QString *error_message);
void extensionsInitialized();
@@ -249,7 +246,6 @@ private:
Node *m_currentNode;
BuildManager *m_buildManager;
- QtVersionManager *m_versionManager;
QList<Internal::ProjectFileFactory*> m_fileFactories;
QStringList m_profileMimeTypes;
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index c9d0f4dce59689a91f7a37cfdeec3112810deee4..ac021e8976efb37f0c47957478b02c32cd3d7156 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -59,8 +59,7 @@ HEADERS += projectexplorer.h \
gccparser.h \
msvcparser.h \
filewatcher.h \
- qtversionmanager.h \
- qtoptionspage.h
+ debugginghelper.h
SOURCES += projectexplorer.cpp \
projectwindow.cpp \
buildmanager.cpp \
@@ -108,8 +107,7 @@ SOURCES += projectexplorer.cpp \
gccparser.cpp \
msvcparser.cpp \
filewatcher.cpp \
- qtversionmanager.cpp \
- qtoptionspage.cpp
+ debugginghelper.cpp
FORMS += dependenciespanel.ui \
buildsettingspropertiespage.ui \
processstep.ui \
@@ -118,9 +116,7 @@ FORMS += dependenciespanel.ui \
sessiondialog.ui \
projectwizardpage.ui \
buildstepspage.ui \
- removefiledialog.ui \
- qtversionmanager.ui \
- showbuildlog.ui
+ removefiledialog.ui
win32 {
SOURCES += applicationlauncher_win.cpp \
winguiprocess.cpp
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index 0a749cc7bd5c83104beeb512c9bb1aa87f53dc28..10c56b8deaa91a3699b5a213a63ba9cbdc707411 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -176,11 +176,6 @@ const char * const RESOURCE_MIMETYPE = "application/vnd.nokia.xml.qt.resource";
// build parsers
const char * const BUILD_PARSER_MSVC = "BuildParser.MSVC";
const char * const BUILD_PARSER_GCC = "BuildParser.Gcc";
-
-//Qt4 settings pages
-const char * const QT_CATEGORY = "Qt4";
-const char * const QTVERSION_PAGE = "Qt Versions";
-const char * const BUILD_ENVIRONMENT_PAGE = "Build Environments";
} // namespace Constants
} // namespace ProjectExplorer
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index c3d9b5957521fd02c1eb8834ee83f882f86beb85..b972142925bd954ac4587bf59b136471150a8ac9 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -43,7 +43,6 @@
using ProjectExplorer::IBuildParserFactory;
using ProjectExplorer::BuildParserInterface;
using ProjectExplorer::Environment;
-using ProjectExplorer::QtVersion;
using ExtensionSystem::PluginManager;
using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h
index 91af6a69eca221fa306eaa36f30a9824b751c427..4276ea770980636c62a839d0a16bd4cd3e59903a 100644
--- a/src/plugins/qt4projectmanager/makestep.h
+++ b/src/plugins/qt4projectmanager/makestep.h
@@ -31,16 +31,15 @@
#define MAKESTEP_H
#include "ui_makestep.h"
+#include "qtversionmanager.h"
#include <projectexplorer/abstractprocessstep.h>
#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/qtversionmanager.h>
namespace ProjectExplorer {
class BuildStep;
class IBuildStepFactory;
class Project;
-class QtVersion;
}
namespace Qt4ProjectManager {
@@ -82,7 +81,7 @@ private slots:
void addDirectory(const QString &dir);
void removeDirectory(const QString &dir);
private:
- ProjectExplorer::BuildParserInterface *buildParser(const ProjectExplorer::QtVersion *const version);
+ ProjectExplorer::BuildParserInterface *buildParser(const QtVersion *const version);
Qt4Project *m_project;
ProjectExplorer::BuildParserInterface *m_buildParser;
bool m_skipMakeClean;
diff --git a/src/plugins/qt4projectmanager/profilereader.cpp b/src/plugins/qt4projectmanager/profilereader.cpp
index 109a3ffd9184b81be60d856b0ca97700b28b22e1..32b600cd288c78a4f78fa5222e4ea1c28eaeec31 100644
--- a/src/plugins/qt4projectmanager/profilereader.cpp
+++ b/src/plugins/qt4projectmanager/profilereader.cpp
@@ -35,8 +35,6 @@
using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal;
-using ProjectExplorer::QtVersion;
-
ProFileReader::ProFileReader()
{
}
diff --git a/src/plugins/qt4projectmanager/profilereader.h b/src/plugins/qt4projectmanager/profilereader.h
index 79833c02dff42cf4697e7df89debe35222b11e3a..08397f36df0632f6f63fbbee5a6effe69bb95b4e 100644
--- a/src/plugins/qt4projectmanager/profilereader.h
+++ b/src/plugins/qt4projectmanager/profilereader.h
@@ -31,7 +31,7 @@
#define PROFILEREADER_H
#include "profileevaluator.h"
-#include <projectexplorer/qtversionmanager.h>
+#include "qtversionmanager.h"
#include <QtCore/QObject>
#include <QtCore/QMap>
@@ -47,7 +47,7 @@ public:
ProFileReader();
~ProFileReader();
- void setQtVersion(ProjectExplorer::QtVersion *qtVersion);
+ void setQtVersion(QtVersion *qtVersion);
bool readProFile(const QString &fileName);
QList<ProFile*> includeFiles() const;
diff --git a/src/plugins/qt4projectmanager/projectloadwizard.cpp b/src/plugins/qt4projectmanager/projectloadwizard.cpp
index 31c0da2cde1149ade06cd775fcb4fef7d44ec996..3887e4f9487e2702562accdf0c0296ce210f9d8e 100644
--- a/src/plugins/qt4projectmanager/projectloadwizard.cpp
+++ b/src/plugins/qt4projectmanager/projectloadwizard.cpp
@@ -45,14 +45,12 @@
using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal;
-using ProjectExplorer::QtVersion;
-
ProjectLoadWizard::ProjectLoadWizard(Qt4Project *project, QWidget *parent, Qt::WindowFlags flags)
: QWizard(parent, flags), m_project(project), m_importVersion(0), m_temporaryVersion(false)
{
- ProjectExplorer::QtVersionManager * vm = ProjectExplorer::QtVersionManager::instance();
+ QtVersionManager * vm = QtVersionManager::instance();
QString directory = QFileInfo(project->file()->fileName()).absolutePath();
- QString importVersion = ProjectExplorer::QtVersionManager::findQtVersionFromMakefile(directory);
+ QString importVersion = QtVersionManager::findQtVersionFromMakefile(directory);
if (!importVersion.isNull()) {
// This also means we have a build in there
@@ -65,7 +63,7 @@ ProjectLoadWizard::ProjectLoadWizard(Qt4Project *project, QWidget *parent, Qt::W
}
m_importBuildConfig = m_importVersion->defaultBuildConfig();
- m_importBuildConfig= ProjectExplorer::QtVersionManager::scanMakefileForQmakeConfig(directory, m_importBuildConfig);
+ m_importBuildConfig= QtVersionManager::scanMakefileForQmakeConfig(directory, m_importBuildConfig);
}
// So now we have the version and the configuration for that version
@@ -129,7 +127,7 @@ void ProjectLoadWizard::addBuildConfiguration(QString name, QtVersion *qtversion
void ProjectLoadWizard::done(int result)
{
- ProjectExplorer::QtVersionManager *vm = ProjectExplorer::QtVersionManager::instance();
+ QtVersionManager *vm = QtVersionManager::instance();
QWizard::done(result);
// This normally happens on showing the final page, but since we
// don't show it anymore, do it here
diff --git a/src/plugins/qt4projectmanager/projectloadwizard.h b/src/plugins/qt4projectmanager/projectloadwizard.h
index add96b6e7a9bab4f6e7a24dd947ff262795e0a32..b6d886fe1501d89277817a45a01d507e488149ec 100644
--- a/src/plugins/qt4projectmanager/projectloadwizard.h
+++ b/src/plugins/qt4projectmanager/projectloadwizard.h
@@ -30,7 +30,7 @@
#ifndef PROJECTLOADWIZARD_H
#define PROJECTLOADWIZARD_H
-#include <projectexplorer/qtversionmanager.h>
+#include "qtversionmanager.h"
#include <QtGui/QWizard>
@@ -57,14 +57,14 @@ public:
void execDialog();
private:
- void addBuildConfiguration(QString name, ProjectExplorer::QtVersion *qtversion, ProjectExplorer::QtVersion::QmakeBuildConfig buildConfiguration);
- void setupImportPage(ProjectExplorer::QtVersion *version, ProjectExplorer::QtVersion::QmakeBuildConfig buildConfig);
+ void addBuildConfiguration(QString name, QtVersion *qtversion, QtVersion::QmakeBuildConfig buildConfiguration);
+ void setupImportPage(QtVersion *version, QtVersion::QmakeBuildConfig buildConfig);
Qt4Project *m_project;
// Only used for imported stuff
- ProjectExplorer::QtVersion *m_importVersion;
- ProjectExplorer::QtVersion::QmakeBuildConfig m_importBuildConfig;
+ QtVersion *m_importVersion;
+ QtVersion::QmakeBuildConfig m_importBuildConfig;
// Those that we might add
bool m_temporaryVersion;
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index b333016c0eb1571d78c5a811b7af2972f1205176..514feb9f3716baa1eb9226d40ca6e3f66fd9c2e2 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -33,10 +33,10 @@
#include "qt4projectmanagerconstants.h"
#include "qt4projectmanager.h"
#include "makestep.h"
+#include "qtversionmanager.h"
#include <coreplugin/icore.h>
#include <utils/qtcassert.h>
-#include <projectexplorer/qtversionmanager.h>
#include <QFileDialog>
#include <QDir>
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index ac790dbfa1076e1150fe6b76a7cc9d24e106e5ea..66c32661c35cc99ba000f36c578f7818962de15e 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -64,7 +64,6 @@
using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal;
-using ProjectExplorer::QtVersion;
namespace {
bool debug = false;
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index a97303cf32380f8f0307254d3a240f2bff8c3f58..ae6a76ecbc1dd833e75255204eedb2ffebb2e1f4 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -41,6 +41,7 @@
#include "qt4buildenvironmentwidget.h"
#include "qt4projectmanagerconstants.h"
#include "projectloadwizard.h"
+#include "qtversionmanager.h"
#include <coreplugin/icore.h>
#include <coreplugin/messagemanager.h>
@@ -50,7 +51,6 @@
#include <projectexplorer/nodesvisitor.h>
#include <projectexplorer/project.h>
#include <projectexplorer/customexecutablerunconfiguration.h>
-#include <projectexplorer/qtversionmanager.h>
#include <QtCore/QDebug>
#include <QtCore/QDir>
@@ -236,7 +236,7 @@ Qt4Project::Qt4Project(Qt4Manager *manager, const QString& fileName) :
{
m_manager->registerProject(this);
- ProjectExplorer::QtVersionManager *vm = ProjectExplorer::QtVersionManager::instance();
+ QtVersionManager *vm = QtVersionManager::instance();
connect(vm, SIGNAL(defaultQtVersionChanged()),
this, SLOT(defaultQtVersionChanged()));
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index c27be2be3fb9875130b633977e7a884ac9ead6f1..6801fd0f40abdf50b090146cabe69e4e513f2312 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -33,12 +33,12 @@
#include "qt4nodes.h"
#include "qmakestep.h"
#include "makestep.h"
+#include "qtversionmanager.h"
#include <coreplugin/ifile.h>
#include <projectexplorer/applicationrunconfiguration.h>
#include <projectexplorer/projectnodes.h>
#include <projectexplorer/toolchain.h>
-#include <projectexplorer/qtversionmanager.h>
#include <QtCore/QObject>
#include <QtCore/QList>
@@ -148,7 +148,7 @@ public:
//returns the qtVersion, if the project is set to use the default qt version, then
// that is returned
// to check wheter the project uses the default qt version use qtVersionId
- ProjectExplorer::QtVersion *qtVersion(const QString &buildConfiguration) const;
+ QtVersion *qtVersion(const QString &buildConfiguration) const;
// returns the id of the qt version, if the project is using the default qt version
// this function returns 0
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index a50d23bd98c3582697efb873aafff92dfb5d5832..d6267460d96bf73a0674d02643e898daf11abef4 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -43,9 +43,6 @@
#include <QtGui/QFileDialog>
-using ProjectExplorer::QtVersionManager;
-using ProjectExplorer::QtVersion;
-
namespace {
bool debug = false;
}
@@ -84,7 +81,7 @@ Qt4ProjectConfigWidget::Qt4ProjectConfigWidget(Qt4Project *project)
connect(m_ui->manageQtVersionPushButtons, SIGNAL(clicked()),
this, SLOT(manageQtVersions()));
- ProjectExplorer::QtVersionManager *vm = ProjectExplorer::QtVersionManager::instance();
+ QtVersionManager *vm = QtVersionManager::instance();
connect(vm, SIGNAL(qtVersionsChanged()),
this, SLOT(setupQtVersionsComboBox()));
@@ -98,7 +95,7 @@ Qt4ProjectConfigWidget::~Qt4ProjectConfigWidget()
void Qt4ProjectConfigWidget::manageQtVersions()
{
Core::ICore *core = Core::ICore::instance();
- core->showOptionsDialog(ProjectExplorer::Constants::QT_CATEGORY, ProjectExplorer::Constants::QTVERSION_PAGE);
+ core->showOptionsDialog(Constants::QT_CATEGORY, Constants::QTVERSION_PAGE);
}
@@ -184,7 +181,7 @@ void Qt4ProjectConfigWidget::updateImportLabel()
{
m_ui->importLabel->setVisible(false);
if (m_ui->shadowBuildCheckBox->isChecked()) {
- QString qtPath = ProjectExplorer::QtVersionManager::findQtVersionFromMakefile(m_ui->shadowBuildDirEdit->path());
+ QString qtPath = QtVersionManager::findQtVersionFromMakefile(m_ui->shadowBuildDirEdit->path());
if (!qtPath.isEmpty()) {
m_ui->importLabel->setVisible(true);
}
@@ -268,7 +265,7 @@ void Qt4ProjectConfigWidget::qtVersionComboBoxCurrentIndexChanged(const QString
} else {
newQtVersion = m_ui->qtVersionComboBox->itemData(m_ui->qtVersionComboBox->currentIndex()).toInt();
}
- ProjectExplorer::QtVersionManager *vm = ProjectExplorer::QtVersionManager::instance();
+ QtVersionManager *vm = QtVersionManager::instance();
bool isValid = vm->version(newQtVersion)->isValid();
m_ui->invalidQtWarningLabel->setVisible(!isValid);
if (newQtVersion != m_pro->qtVersionId(m_buildConfiguration)) {
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
index 697deb5025cd2a8e2b40d7f6d0b11a7315395018..470e535d730aac437f2c1d9509a230686975d0d4 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
@@ -46,7 +46,6 @@
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/qtversionmanager.h>
#include <utils/listutils.h>
#include <QtCore/QCoreApplication>
@@ -68,8 +67,6 @@ using ProjectExplorer::SourceType;
using ProjectExplorer::FormType;
using ProjectExplorer::ResourceType;
using ProjectExplorer::UnknownFileType;
-using ProjectExplorer::QtVersion;
-using ProjectExplorer::QtVersionManager;
// Known file types of a Qt 4 project
static const char* qt4FileTypes[] = {
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index d471edb8cc00e410f81f133887d187c525600f11..7df7e44bdedfef46c5c16f6bb5d3240c31de6f58 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -32,7 +32,9 @@ HEADERS = qt4projectmanagerplugin.h \
speinfo.h \
qt4projectconfigwidget.h \
qt4buildenvironmentwidget.h \
- projectloadwizard.h
+ projectloadwizard.h\
+ qtversionmanager.h\
+ qtoptionspage.h
SOURCES = qt4projectmanagerplugin.cpp \
qt4projectmanager.cpp \
qt4project.cpp \
@@ -60,7 +62,9 @@ SOURCES = qt4projectmanagerplugin.cpp \
speinfo.cpp \
qt4projectconfigwidget.cpp \
qt4buildenvironmentwidget.cpp \
- projectloadwizard.cpp
+ projectloadwizard.cpp\
+ qtversionmanager.cpp\
+ qtoptionspage.cpp
FORMS = envvariablespage.ui \
enveditdialog.ui \
proeditorcontainer.ui \
@@ -68,7 +72,9 @@ FORMS = envvariablespage.ui \
qmakestep.ui \
qt4projectconfigwidget.ui \
embeddedpropertiespage.ui \
- qt4buildenvironmentwidget.ui
+ qt4buildenvironmentwidget.ui \
+ qtversionmanager.ui\
+ showbuildlog.ui
RESOURCES = qt4projectmanager.qrc \
wizards/wizards.qrc
include(../../shared/proparser/proparser.pri)
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
index 5da496dde9ce48367035c3bd21049eb522c697bc..c6257e36c4f1e6ef8ca6d33f748166ef72c1b660 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
@@ -73,6 +73,11 @@ const char * const DEPLOYHELPERRUNSTEP = "trolltech.qt4projectmanager.deployhelp
const char * const VIEW_DETAILED = "Qt4.View.Detailed";
const char * const VIEW_PROFILESONLY = "Qt4.View.ProjectHierarchy";
+//Qt4 settings pages
+const char * const QT_CATEGORY = "Qt4";
+const char * const QTVERSION_PAGE = "Qt Versions";
+const char * const BUILD_ENVIRONMENT_PAGE = "Build Environments";
+
} // namespace Constants
} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index 22db266f46cdd3ad8cb0e51e4650dfe1bae06490..a199b43c7312088a011a04c686272807d529fcfa 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -39,6 +39,8 @@
#include "embeddedpropertiespage.h"
#include "qt4runconfiguration.h"
#include "profilereader.h"
+#include "qtversionmanager.h"
+#include "qtoptionspage.h"
#include <coreplugin/icore.h>
#include <extensionsystem/pluginmanager.h>
@@ -47,7 +49,6 @@
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectnodes.h>
-#include <projectexplorer/qtversionmanager.h>
#include <coreplugin/uniqueidmanager.h>
#include <coreplugin/mimedatabase.h>
#include <coreplugin/actionmanager/actionmanager.h>
@@ -64,7 +65,6 @@
using namespace Qt4ProjectManager::Internal;
using namespace Qt4ProjectManager;
using ProjectExplorer::Project;
-using ProjectExplorer::QtVersionManager;
Qt4ProjectManagerPlugin::~Qt4ProjectManagerPlugin()
{
@@ -97,9 +97,14 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
return false;
m_projectExplorer = ProjectExplorer::ProjectExplorerPlugin::instance();
-
Core::ActionManager *am = core->actionManager();
+ QtVersionManager::m_self = new QtVersionManager();
+ addAutoReleasedObject(QtVersionManager::m_self);
+
+ addAutoReleasedObject(new QtOptionsPage());
+
+
//create and register objects
m_qt4ProjectManager = new Qt4Manager(this);
addObject(m_qt4ProjectManager);
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
index 7dce30081e9c7e667936418f445259bfb5716999..febde6bb1350db3c2f63781a13840c4ba8dcaffb 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
@@ -33,13 +33,10 @@
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h>
-namespace ProjectExplorer {
- class QtVersionManager;
-}
-
namespace Qt4ProjectManager {
class Qt4Manager;
+class QtVersionManager;
namespace Internal {
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index 3741b8a20fc3f45c408ea0a0d13951cd72949995..abcd410b4d1c9ef6175680334414864e0898b0d7 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -51,7 +51,6 @@ using namespace Qt4ProjectManager;
using ProjectExplorer::ApplicationRunConfiguration;
using ProjectExplorer::PersistentSettingsReader;
using ProjectExplorer::PersistentSettingsWriter;
-using ProjectExplorer::QtVersion;
Qt4RunConfiguration::Qt4RunConfiguration(Qt4Project *pro, const QString &proFilePath)
: ApplicationRunConfiguration(pro),
@@ -422,7 +421,7 @@ QString Qt4RunConfiguration::dumperLibrary() const
{
Qt4Project *pro = qobject_cast<Qt4Project *>(project());
QtVersion *version = pro->qtVersion(pro->activeBuildConfiguration());
- return version->dumperLibrary();
+ return version->debuggingHelperLibrary();
}
diff --git a/src/plugins/projectexplorer/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp
similarity index 99%
rename from src/plugins/projectexplorer/qtoptionspage.cpp
rename to src/plugins/qt4projectmanager/qtoptionspage.cpp
index c0ebf08ee18c36aaec525e0aa9b8b675419cd798..3848763524fd25888ffc72db5667567d29170134 100644
--- a/src/plugins/projectexplorer/qtoptionspage.cpp
+++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp
@@ -1,14 +1,14 @@
#include "qtoptionspage.h"
#include "ui_showbuildlog.h"
#include "ui_qtversionmanager.h"
-#include "projectexplorerconstants.h"
+#include "qt4projectmanagerconstants.h"
#include "qtversionmanager.h"
#include <coreplugin/coreconstants.h>
#include <QtCore/QDir>
-using namespace ProjectExplorer;
-using namespace ProjectExplorer::Internal;
+using namespace Qt4ProjectManager;
+using namespace Qt4ProjectManager::Internal;
///
// QtOptionsPage
///
diff --git a/src/plugins/projectexplorer/qtoptionspage.h b/src/plugins/qt4projectmanager/qtoptionspage.h
similarity index 97%
rename from src/plugins/projectexplorer/qtoptionspage.h
rename to src/plugins/qt4projectmanager/qtoptionspage.h
index 4d7df925343ae6b9fb67bc258c50659d943a8d19..be4fee3d8fb0467d8882f57ce38109fd59b68e58 100644
--- a/src/plugins/projectexplorer/qtoptionspage.h
+++ b/src/plugins/qt4projectmanager/qtoptionspage.h
@@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE
class QTreeWidgetItem;
QT_END_NAMESPACE
-namespace ProjectExplorer {
+namespace Qt4ProjectManager {
class QtVersion;
@@ -101,7 +101,7 @@ private:
};
} //namespace Internal
-} //namespace ProjectExplorer
+} //namespace Qt4ProjectManager
#endif // QTOPTIONSPAGE_H
diff --git a/src/plugins/projectexplorer/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
similarity index 72%
rename from src/plugins/projectexplorer/qtversionmanager.cpp
rename to src/plugins/qt4projectmanager/qtversionmanager.cpp
index 05d2770c35e81367b4c98616d4e1846595b2ed92..e4ea46516c97677f0810b6f5d5b549682fc20e1e 100644
--- a/src/plugins/projectexplorer/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -29,11 +29,11 @@
#include "qtversionmanager.h"
-#include "projectexplorerconstants.h"
-#include "cesdkhandler.h"
-
-#include "projectexplorer.h"
+#include "qt4projectmanagerconstants.h"
+#include <projectexplorer/debugginghelper.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/cesdkhandler.h>
#include <coreplugin/icore.h>
#include <extensionsystem/pluginmanager.h>
#include <help/helpplugin.h>
@@ -45,14 +45,16 @@
#include <QtGui/QApplication>
#include <QtGui/QDesktopServices>
-using namespace ProjectExplorer;
-using namespace ProjectExplorer::Internal;
+using namespace Qt4ProjectManager;
+using namespace Qt4ProjectManager::Internal;
+
+using ProjectExplorer::DebuggingHelperLibrary;
static const char *QtVersionsSectionName = "QtVersions";
static const char *defaultQtVersionKey = "DefaultQtVersion";
static const char *newQtVersionsKey = "NewQtVersions";
-
+QtVersionManager *QtVersionManager::m_self = 0;
QtVersionManager::QtVersionManager()
: m_emptyVersion(new QtVersion)
@@ -102,7 +104,7 @@ QtVersionManager::~QtVersionManager()
QtVersionManager *QtVersionManager::instance()
{
- return ProjectExplorerPlugin::instance()->qtVersionManager();
+ return m_self;
}
void QtVersionManager::addVersion(QtVersion *version)
@@ -230,9 +232,19 @@ void QtVersionManager::addNewVersionsFromInstaller()
void QtVersionManager::updateSystemVersion()
{
bool haveSystemVersion = false;
+ QString systemQMakePath = DebuggingHelperLibrary::findSystemQt(ProjectExplorer::Environment::systemEnvironment());
+ QString systemQtPath;
+ if (systemQMakePath.isNull()) {
+ systemQtPath = tr("<not found>");
+ } else {
+ QDir dir(QFileInfo(systemQMakePath).absoluteDir());
+ dir.cdUp();
+ systemQtPath = dir.absolutePath();
+ }
+
foreach (QtVersion *version, m_versions) {
if (version->isSystemVersion()) {
- version->setPath(findSystemQt());
+ version->setPath(systemQtPath);
version->setName(tr("Auto-detected Qt"));
haveSystemVersion = true;
}
@@ -240,7 +252,7 @@ void QtVersionManager::updateSystemVersion()
if (haveSystemVersion)
return;
QtVersion *version = new QtVersion(tr("Auto-detected Qt"),
- findSystemQt(),
+ systemQtPath,
getUniqueId(),
true);
m_versions.prepend(version);
@@ -249,54 +261,6 @@ void QtVersionManager::updateSystemVersion()
++m_defaultVersion;
}
-QStringList QtVersionManager::possibleQMakeCommands()
-{
- // On windows noone has renamed qmake, right?
-#ifdef Q_OS_WIN
- return QStringList() << "qmake.exe";
-#endif
- // On unix some distributions renamed qmake to avoid clashes
- QStringList result;
- result << "qmake-qt4" << "qmake4" << "qmake";
- return result;
-}
-
-QString QtVersionManager::qtVersionForQMake(const QString &qmakePath)
-{
- QProcess qmake;
- qmake.start(qmakePath, QStringList()<<"--version");
- if (!qmake.waitForFinished())
- return false;
- QString output = qmake.readAllStandardOutput();
- QRegExp regexp("(QMake version|QMake version:)[\\s]*([\\d.]*)", Qt::CaseInsensitive);
- regexp.indexIn(output);
- if (regexp.cap(2).startsWith("2.")) {
- QRegExp regexp2("Using Qt version[\\s]*([\\d\\.]*)", Qt::CaseInsensitive);
- regexp2.indexIn(output);
- return regexp2.cap(1);
- }
- return QString();
-}
-
-QString QtVersionManager::findSystemQt() const
-{
- Environment env = Environment::systemEnvironment();
- QStringList paths = env.path();
- foreach (const QString &path, paths) {
- foreach (const QString &possibleCommand, possibleQMakeCommands()) {
- QFileInfo qmake(path + "/" + possibleCommand);
- if (qmake.exists()) {
- if (!qtVersionForQMake(qmake.absoluteFilePath()).isNull()) {
- QDir dir(qmake.absoluteDir());
- dir.cdUp();
- return dir.absolutePath();
- }
- }
- }
- }
- return tr("<not found>");
-}
-
QtVersion *QtVersionManager::currentQtVersion() const
{
if (m_defaultVersion < m_versions.count())
@@ -421,32 +385,7 @@ void QtVersion::setPath(const QString &path)
m_mkspecUpToDate = false;
m_qmakeCommand = QString::null;
// TODO do i need to optimize this?
- m_hasDebuggingHelper = !dumperLibrary().isEmpty();
-}
-
-QString QtVersion::dumperLibrary() const
-{
- uint hash = qHash(path());
- QString qtInstallData = versionInfo().value("QT_INSTALL_DATA");
- if (qtInstallData.isEmpty())
- qtInstallData = path();
- QStringList directories;
- directories
- << (qtInstallData + "/qtc-debugging-helper/")
- << (QApplication::applicationDirPath() + "/../qtc-debugging-helper/" + QString::number(hash)) + "/"
- << (QDesktopServices::storageLocation(QDesktopServices::DataLocation) + "/qtc-debugging-helper/" + QString::number(hash)) + "/";
- foreach(const QString &directory, directories) {
-#if defined(Q_OS_WIN)
- QFileInfo fi(directory + "debug/gdbmacros.dll");
-#elif defined(Q_OS_MAC)
- QFileInfo fi(directory + "libgdbmacros.dylib");
-#else // generic UNIX
- QFileInfo fi(directory + "libgdbmacros.so");
-#endif
- if (fi.exists())
- return fi.filePath();
- }
- return QString();
+ m_hasDebuggingHelper = !debuggingHelperLibrary().isEmpty();
}
void QtVersion::updateSourcePath()
@@ -723,80 +662,60 @@ void QtVersion::updateMkSpec() const
//qDebug()<<"Finding mkspec for"<<path();
QString mkspec;
-// QFile f(path() + "/.qmake.cache");
-// if (f.exists() && f.open(QIODevice::ReadOnly)) {
-// while (!f.atEnd()) {
-// QByteArray line = f.readLine();
-// if (line.startsWith("QMAKESPEC")) {
-// const QList<QByteArray> &temp = line.split('=');
-// if (temp.size() == 2) {
-// mkspec = temp.at(1).trimmed();
-// if (mkspec.startsWith("$$QT_BUILD_TREE/mkspecs/"))
-// mkspec = mkspec.mid(QString("$$QT_BUILD_TREE/mkspecs/").length());
-// else if (mkspec.startsWith("$$QT_BUILD_TREE\\mkspecs\\"))
-// mkspec = mkspec.mid(QString("$$QT_BUILD_TREE\\mkspecs\\").length());
-// mkspec = QDir::fromNativeSeparators(mkspec);
-// }
-// break;
-// }
-// }
-// f.close();
-// } else {
- // no .qmake.cache so look at the default mkspec
- QString mkspecPath = versionInfo().value("QMAKE_MKSPECS");
- if (mkspecPath.isEmpty())
- mkspecPath = path() + "/mkspecs/default";
- else
- mkspecPath = mkspecPath + "/default";
+ // no .qmake.cache so look at the default mkspec
+ QString mkspecPath = versionInfo().value("QMAKE_MKSPECS");
+ if (mkspecPath.isEmpty())
+ mkspecPath = path() + "/mkspecs/default";
+ else
+ mkspecPath = mkspecPath + "/default";
// qDebug() << "default mkspec is located at" << mkspecPath;
#ifdef Q_OS_WIN
- QFile f2(mkspecPath + "/qmake.conf");
- if (f2.exists() && f2.open(QIODevice::ReadOnly)) {
- while (!f2.atEnd()) {
- QByteArray line = f2.readLine();
- if (line.startsWith("QMAKESPEC_ORIGINAL")) {
- const QList<QByteArray> &temp = line.split('=');
- if (temp.size() == 2) {
- mkspec = temp.at(1).trimmed();
- }
- break;
+ QFile f2(mkspecPath + "/qmake.conf");
+ if (f2.exists() && f2.open(QIODevice::ReadOnly)) {
+ while (!f2.atEnd()) {
+ QByteArray line = f2.readLine();
+ if (line.startsWith("QMAKESPEC_ORIGINAL")) {
+ const QList<QByteArray> &temp = line.split('=');
+ if (temp.size() == 2) {
+ mkspec = temp.at(1).trimmed();
}
+ break;
}
- f2.close();
}
+ f2.close();
+ }
#elif defined(Q_OS_MAC)
- QFile f2(mkspecPath + "/qmake.conf");
- if (f2.exists() && f2.open(QIODevice::ReadOnly)) {
- while (!f2.atEnd()) {
- QByteArray line = f2.readLine();
- if (line.startsWith("MAKEFILE_GENERATOR")) {
- const QList<QByteArray> &temp = line.split('=');
- if (temp.size() == 2) {
- const QByteArray &value = temp.at(1);
- if (value.contains("XCODE")) {
- // we don't want to generate xcode projects...
-// qDebug() << "default mkspec is xcode, falling back to g++";
- mkspec = "macx-g++";
- } else {
- //resolve mkspec link
- QFileInfo f3(mkspecPath);
- if (f3.isSymLink()) {
- mkspec = f3.symLinkTarget();
- }
+ QFile f2(mkspecPath + "/qmake.conf");
+ if (f2.exists() && f2.open(QIODevice::ReadOnly)) {
+ while (!f2.atEnd()) {
+ QByteArray line = f2.readLine();
+ if (line.startsWith("MAKEFILE_GENERATOR")) {
+ const QList<QByteArray> &temp = line.split('=');
+ if (temp.size() == 2) {
+ const QByteArray &value = temp.at(1);
+ if (value.contains("XCODE")) {
+ // we don't want to generate xcode projects...
+// qDebug() << "default mkspec is xcode, falling back to g++";
+ mkspec = "macx-g++";
+ } else {
+ //resolve mkspec link
+ QFileInfo f3(mkspecPath);
+ if (f3.isSymLink()) {
+ mkspec = f3.symLinkTarget();
}
}
- break;
}
+ break;
}
- f2.close();
}
+ f2.close();
+ }
#else
- QFileInfo f2(mkspecPath);
- if (f2.isSymLink()) {
- mkspec = f2.symLinkTarget();
- }
+ QFileInfo f2(mkspecPath);
+ if (f2.isSymLink()) {
+ mkspec = f2.symLinkTarget();
+ }
#endif
-// }
m_mkspecFullPath = mkspec;
int index = mkspec.lastIndexOf('/');
@@ -819,11 +738,11 @@ QString QtVersion::qmakeCommand() const
return m_qmakeCommand;
QDir qtDir = path() + "/bin/";
- foreach (const QString &possibleCommand, QtVersionManager::possibleQMakeCommands()) {
+ foreach (const QString &possibleCommand, DebuggingHelperLibrary::possibleQMakeCommands()) {
QString s = qtDir.absoluteFilePath(possibleCommand);
QFileInfo qmake(s);
if (qmake.exists() && qmake.isExecutable()) {
- QString qtVersion = QtVersionManager::qtVersionForQMake(qmake.absoluteFilePath());
+ QString qtVersion = DebuggingHelperLibrary::qtVersionForQMake(qmake.absoluteFilePath());
if (!qtVersion.isNull()) {
m_qtVersionString = qtVersion;
m_qmakeCommand = qmake.absoluteFilePath();
@@ -880,7 +799,7 @@ void QtVersion::setMsvcVersion(const QString &version)
m_msvcVersion = version;
}
-void QtVersion::addToEnvironment(Environment &env)
+void QtVersion::addToEnvironment(ProjectExplorer::Environment &env)
{
env.set("QTDIR", m_path);
QString qtdirbin = versionInfo().value("QT_INSTALL_BINS");
@@ -921,121 +840,54 @@ bool QtVersion::hasDebuggingHelper() const
return m_hasDebuggingHelper;
}
-
-// TODO buildDebuggingHelperLibrary needs to be accessible outside of the
-// qt4versionmanager
-// That probably means moving qt4version management into either the projectexplorer
-// (The Projectexplorer plugin probably needs some splitting up, most of the stuff
-// could be in a plugin shared by qt4projectmanager, cmakemanager and debugger.)
-QString QtVersion::buildDebuggingHelperLibrary()
+QString QtVersion::debuggingHelperLibrary() const
{
-// Locations to try:
-// $QTDIR/qtc-debugging-helper
-// $APPLICATION-DIR/qtc-debugging-helper/$hash
-// $USERDIR/qtc-debugging-helper/$hash
-
- QString output;
- uint hash = qHash(path());
QString qtInstallData = versionInfo().value("QT_INSTALL_DATA");
if (qtInstallData.isEmpty())
qtInstallData = path();
- QStringList directories;
- directories
- << qtInstallData + "/qtc-debugging-helper/"
- << QApplication::applicationDirPath() + "/../qtc-debugging-helper/" + QString::number(hash) +"/"
- << QDesktopServices::storageLocation (QDesktopServices::DataLocation) + "/qtc-debugging-helper/" + QString::number(hash) +"/";
-
- QStringList files;
- files << "gdbmacros.cpp" << "gdbmacros.pro"
- << "LICENSE.LGPL" << "LGPL_EXCEPTION.TXT";
-
- foreach(const QString &directory, directories) {
- QString dumperPath = Core::ICore::instance()->resourcePath() + "/gdbmacros/";
- bool success = true;
- QDir().mkpath(directory);
- foreach (const QString &file, files) {
- QString source = dumperPath + file;
- QString dest = directory + file;
- QFileInfo destInfo(dest);
- if (destInfo.exists()) {
- if (destInfo.lastModified() >= QFileInfo(source).lastModified())
- continue;
- success &= QFile::remove(dest);
- }
- success &= QFile::copy(source, dest);
- }
- if (!success)
- continue;
-
- // Setup process
- QProcess proc;
-
- ProjectExplorer::Environment env = ProjectExplorer::Environment::systemEnvironment();
- addToEnvironment(env);
- // TODO this is a hack to get, to be removed and rewritten for 1.2
- // For MSVC and MINGW, we need a toolchain to get the right environment
- ProjectExplorer::ToolChain *toolChain = 0;
- ProjectExplorer::ToolChain::ToolChainType t = toolchainType();
- if (t == ProjectExplorer::ToolChain::MinGW)
- toolChain = ProjectExplorer::ToolChain::createMinGWToolChain("g++", mingwDirectory());
- else if(t == ProjectExplorer::ToolChain::MSVC)
- toolChain = ProjectExplorer::ToolChain::createMSVCToolChain(msvcVersion());
- if (toolChain) {
- toolChain->addToEnvironment(env);
- delete toolChain;
- toolChain = 0;
- }
-
- proc.setEnvironment(env.toStringList());
- proc.setWorkingDirectory(directory);
- proc.setProcessChannelMode(QProcess::MergedChannels);
-
- output += QString("Building debugging helper library in %1\n").arg(directory);
- output += "\n";
-
- QString make;
- // TODO this is butt ugly
- // only qt4projects have a toolchain() method. (Reason mostly, that in order to create
- // the toolchain, we need to have the path to gcc
- // which might depend on environment settings of the project
- // so we hardcode the toolchainType to make conversation here
- // and think about how to fix that later
- if (t == ProjectExplorer::ToolChain::MinGW)
- make = "mingw32-make.exe";
- else if(t == ProjectExplorer::ToolChain::MSVC || t == ProjectExplorer::ToolChain::WINCE)
- make = "nmake.exe";
- else if (t == ProjectExplorer::ToolChain::GCC || t == ProjectExplorer::ToolChain::LinuxICC)
- make = "make";
-
- QString makeFullPath = env.searchInPath(make);
- if (!makeFullPath.isEmpty()) {
- output += QString("Running %1 clean...\n").arg(makeFullPath);
- proc.start(makeFullPath, QStringList() << "clean");
- proc.waitForFinished();
- output += proc.readAll();
- } else {
- output += QString("%1 not found in PATH\n").arg(make);
- break;
- }
-
- output += QString("\nRunning %1 ...\n").arg(qmakeCommand());
-
- proc.start(qmakeCommand(), QStringList()<<"-spec"<< mkspec() <<"gdbmacros.pro");
- proc.waitForFinished();
+ return DebuggingHelperLibrary::debuggingHelperLibrary(qtInstallData, path());
+}
- output += proc.readAll();
- output += "\n";
- if (!makeFullPath.isEmpty()) {
- output += QString("Running %1 ...\n").arg(makeFullPath);
- proc.start(makeFullPath, QStringList());
- proc.waitForFinished();
- output += proc.readAll();
- } else {
- output += QString("%1 not found in PATH\n").arg(make);
- }
- break;
+QString QtVersion::buildDebuggingHelperLibrary()
+{
+ QString qtInstallData = versionInfo().value("QT_INSTALL_DATA");
+ if (qtInstallData.isEmpty())
+ qtInstallData = path();
+ ProjectExplorer::Environment env = ProjectExplorer::Environment::systemEnvironment();
+ addToEnvironment(env);
+
+ // TODO this is a hack to get, to be removed and rewritten for 1.2
+ // For MSVC and MINGW, we need a toolchain to get the right environment
+ ProjectExplorer::ToolChain::ToolChainType t = toolchainType();
+ ProjectExplorer::ToolChain *toolChain = 0;
+ if (t == ProjectExplorer::ToolChain::MinGW)
+ toolChain = ProjectExplorer::ToolChain::createMinGWToolChain("g++", mingwDirectory());
+ else if(t == ProjectExplorer::ToolChain::MSVC)
+ toolChain = ProjectExplorer::ToolChain::createMSVCToolChain(msvcVersion());
+ if (toolChain) {
+ toolChain->addToEnvironment(env);
+ delete toolChain;
+ toolChain = 0;
}
- m_hasDebuggingHelper = !dumperLibrary().isEmpty();
+
+ QString make;
+ // TODO this is butt ugly
+ // only qt4projects have a toolchain() method. (Reason mostly, that in order to create
+ // the toolchain, we need to have the path to gcc
+ // which might depend on environment settings of the project
+ // so we hardcode the toolchainType to make conversation here
+ // and think about how to fix that later
+ if (t == ProjectExplorer::ToolChain::MinGW)
+ make = "mingw32-make.exe";
+ else if(t == ProjectExplorer::ToolChain::MSVC || t == ProjectExplorer::ToolChain::WINCE)
+ make = "nmake.exe";
+ else if (t == ProjectExplorer::ToolChain::GCC || t == ProjectExplorer::ToolChain::LinuxICC)
+ make = "make";
+
+ QString directory = DebuggingHelperLibrary::copyDebuggingHelperLibrary(qtInstallData, path());
+ QString output = DebuggingHelperLibrary::buildDebuggingHelperLibrary(directory, make, qmakeCommand(), mkspec(), env);
+ m_hasDebuggingHelper = !debuggingHelperLibrary().isEmpty();
return output;
}
+
diff --git a/src/plugins/projectexplorer/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
similarity index 89%
rename from src/plugins/projectexplorer/qtversionmanager.h
rename to src/plugins/qt4projectmanager/qtversionmanager.h
index 990214769fb405f5baa221faadac616d984359ec..b8b8834bca99777acc0b9b08063850944df24959 100644
--- a/src/plugins/projectexplorer/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -30,20 +30,20 @@
#ifndef QTVERSIONMANAGER_H
#define QTVERSIONMANAGER_H
-#include "environment.h"
-#include "toolchain.h"
-#include "projectexplorer_export.h"
+#include <projectexplorer/environment.h>
+#include <projectexplorer/toolchain.h>
#include <QtCore/QHash>
-namespace ProjectExplorer {
+namespace Qt4ProjectManager {
namespace Internal {
class QtOptionsPageWidget;
class QtOptionsPage;
+class Qt4ProjectManagerPlugin;
}
-class PROJECTEXPLORER_EXPORT QtVersion
+class QtVersion
{
friend class Internal::QtOptionsPageWidget; //for changing name and path
friend class QtVersionManager;
@@ -78,6 +78,7 @@ public:
void addToEnvironment(ProjectExplorer::Environment &env);
bool hasDebuggingHelper() const;
+ QString debuggingHelperLibrary() const;
// Builds a debugging library
// returns the output of the commands
QString buildDebuggingHelperLibrary();
@@ -92,7 +93,6 @@ public:
};
QmakeBuildConfig defaultBuildConfig() const;
- QString dumperLibrary() const;
private:
static int getUniqueId();
// Also used by QtOptionsPageWidget
@@ -124,8 +124,9 @@ private:
bool m_hasDebuggingHelper;
};
-class PROJECTEXPLORER_EXPORT QtVersionManager : public QObject
+class QtVersionManager : public QObject
{
+ friend class Internal::Qt4ProjectManagerPlugin;
Q_OBJECT
// for getUniqueId();
friend class QtVersion;
@@ -145,10 +146,6 @@ public:
void addVersion(QtVersion *version);
// Static Methods
- // returns something like qmake4, qmake, qmake-qt4 or whatever distributions have chosen (used by QtVersion)
- static QStringList possibleQMakeCommands();
- // return true if the qmake at qmakePath is qt4 (used by QtVersion)
- static QString qtVersionForQMake(const QString &qmakePath);
static QtVersion::QmakeBuildConfig scanMakefileForQmakeConfig(const QString &directory, QtVersion::QmakeBuildConfig defaultBuildConfig);
static QString findQtVersionFromMakefile(const QString &directory);
signals:
@@ -163,7 +160,7 @@ private:
void addNewVersionsFromInstaller();
void updateSystemVersion();
void updateDocumentation();
- QString findSystemQt() const;
+
static int indexOfVersionInList(const QtVersion * const version, const QList<QtVersion *> &list);
void updateUniqueIdToIndexMap();
@@ -172,8 +169,10 @@ private:
QList<QtVersion *> m_versions;
QMap<int, int> m_uniqueIdToIndex;
int m_idcount;
+ // managed by QtProjectManagerPlugin
+ static QtVersionManager *m_self;
};
-} // namespace ProjectExplorer
+} // namespace Qt4ProjectManager
#endif // QTVERSIONMANAGER_H
diff --git a/src/plugins/projectexplorer/qtversionmanager.ui b/src/plugins/qt4projectmanager/qtversionmanager.ui
similarity index 97%
rename from src/plugins/projectexplorer/qtversionmanager.ui
rename to src/plugins/qt4projectmanager/qtversionmanager.ui
index dd8b252299d6982e08b942448db1c459776c0887..2dd168325cef1211a516d5954cad18087bc2e83a 100644
--- a/src/plugins/projectexplorer/qtversionmanager.ui
+++ b/src/plugins/qt4projectmanager/qtversionmanager.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>ProjectExplorer::Internal::QtVersionManager</class>
- <widget class="QWidget" name="ProjectExplorer::Internal::QtVersionManager">
+ <class>Qt4ProjectManager::Internal::QtVersionManager</class>
+ <widget class="QWidget" name="Qt4ProjectManager::Internal::QtVersionManager">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/plugins/projectexplorer/showbuildlog.ui b/src/plugins/qt4projectmanager/showbuildlog.ui
similarity index 100%
rename from src/plugins/projectexplorer/showbuildlog.ui
rename to src/plugins/qt4projectmanager/showbuildlog.ui