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

Merge remote-tracking branch 'origin/3.3'

Browse Source 
Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
This commit is contained in:
Eike Ziller
2015-01-08 10:38:20 +01:00
parent 0a5186700c ecd9c4c813
commit b5b47f7df2
72 changed files with 4939 additions and 3784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/testdatadir.cpp
View File

@@ -38,17 +38,9 @@
using namespace Core::Tests;
static void maybeAppendSlash(QString *string)
{
const QChar slash = QLatin1Char('/');
if (!string->endsWith(slash))
string->append(slash);
}
TestDataDir::TestDataDir(const QString &directory)
: m_directory(directory)
{
maybeAppendSlash(&m_directory);
QFileInfo fi(m_directory);
QVERIFY(fi.exists());
QVERIFY(fi.isDir());
@@ -56,7 +48,7 @@ TestDataDir::TestDataDir(const QString &directory)
QString TestDataDir::file(const QString &fileName) const
{
return directory() + fileName;
return directory() + QLatin1Char('/') + fileName;
}
QString TestDataDir::path() const
@@ -71,6 +63,5 @@ QString TestDataDir::directory(const QString &subdir, bool clean) const
path += QLatin1Char('/') + subdir;
if (clean)
path = QDir::cleanPath(path);
maybeAppendSlash(&path);
return path;
}