Commit 0f4d34ae authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Fix bogus warnings when creating a new project

Fix bogus warnings about build locations when setting up a new project.
parent 78b0c59a
......@@ -701,9 +701,9 @@ QtVersion::reportIssues(const QString &proFile, const QString &buildDir)
{
QList<ProjectExplorer::Task> results;
QString tmpBuildDir = buildDir;
if (!buildDir.endsWith(QChar('/')))
tmpBuildDir.append(QChar('/'));
QString tmpBuildDir = QDir(buildDir).absolutePath();
if (!tmpBuildDir.endsWith(QLatin1Char('/')))
tmpBuildDir.append(QLatin1Char('/'));
if (!isValid()) {
//: %1: Reason for being invalid
......@@ -723,9 +723,8 @@ QtVersion::reportIssues(const QString &proFile, const QString &buildDir)
}
QString sourcePath = QFileInfo(proFile).absolutePath();
if (!sourcePath.endsWith(QChar('/')))
sourcePath.append(QChar('/'));
if (!sourcePath.endsWith(QLatin1Char('/')))
sourcePath.append(QLatin1Char('/'));
if ((tmpBuildDir.startsWith(sourcePath)) && (tmpBuildDir != sourcePath)) {
const QString msg = QCoreApplication::translate("Qt4ProjectManager::QtVersion",
"Qmake does not support build directories below the source directory.");
......
......@@ -402,8 +402,10 @@ int AbstractMobileApp::makeStubVersion(int minor)
QString AbstractMobileApp::outputPathBase() const
{
return m_projectPath.absoluteFilePath() + QLatin1Char('/')
+ projectName() + QLatin1Char('/');
QString path = m_projectPath.absoluteFilePath();
if (!path.endsWith(QLatin1Char('/')))
path.append(QLatin1Char('/'));
return path + projectName() + QLatin1Char('/');
}
void AbstractMobileApp::insertParameter(QString &line, const QString &parameter)
......
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