feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qt4BC: Simplify shadowbuild/builddirectory handling

Browse Source 
Change-Id: Id46a239588d21b6aa5d4c43e4d85b52a04bd17ab
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-08-16 17:10:45 +02:00
parent 769788a452
commit 52a41ecb0c
8 changed files with 116 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/projectexplorer/kit.cpp
View File

@@ -33,6 +33,8 @@
#include "ioutputparser.h"
#include "osparser.h"
#include <utils/fileutils.h>
#include <QApplication>
#include <QFileInfo>
#include <QIcon>
@@ -55,22 +57,6 @@ const char ICON_KEY[] = "PE.Profile.Icon";
namespace ProjectExplorer {
// --------------------------------------------------------------------
// Helper:
// --------------------------------------------------------------------
static QString cleanName(const QString &name)
{
QString result = name;
result.replace(QRegExp(QLatin1String("\\W")), QLatin1String("_"));
result.replace(QRegExp(QLatin1String("_+")), QLatin1String("_")); // compact _
result.remove(QRegExp(QLatin1String("^_*"))); // remove leading _
result.remove(QRegExp(QLatin1String("_+$"))); // remove trailing _
if (result.isEmpty())
result = QLatin1String("unknown");
return result;
}
// -------------------------------------------------------------------------
// KitPrivate
// -------------------------------------------------------------------------
@@ -265,14 +251,14 @@ QStringList Kit::candidateNameList(const QString &base) const
QString Kit::fileSystemFriendlyName() const
{
QString name = cleanName(displayName());
QString name = Utils::FileUtils::fileSystemFriendlyName(displayName());
foreach (Kit *i, KitManager::kits()) {
if (i == this)
continue;
if (name == cleanName(i->displayName())) {
if (name == Utils::FileUtils::fileSystemFriendlyName(i->displayName())) {
// append part of the kit id: That should be unique enough;-)
// Leading { will be turned into _ which should be fine.
name = cleanName(name + QLatin1Char('_') + (id().toString().left(7)));
name = Utils::FileUtils::fileSystemFriendlyName(name + QLatin1Char('_') + (id().toString().left(7)));
break;
}
}