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

Compile autotools-plugin with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: If8928c5d2d878339aa3a7808655f8125e0a012cf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-04-03 11:53:55 +02:00
parent 1348e92971
commit 42625ec3d2
9 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
View File

@@ -312,7 +312,7 @@ void AutotoolsProject::makefileParsingFinished()
// Add configure.ac file to project and watch for changes.
const QLatin1String configureAc(QLatin1String("configure.ac"));
const QFile configureAcFile(fileInfo.absolutePath() + QChar('/') + configureAc);
const QFile configureAcFile(fileInfo.absolutePath() + QLatin1Char('/') + configureAc);
if (configureAcFile.exists()) {
files.append(configureAc);
const QString configureAcFilePath = dir.absoluteFilePath(configureAc);
@@ -363,13 +363,10 @@ void AutotoolsProject::buildFileNodeTree(const QDir &directory,
if (file.contains(QLatin1String(".moc")))
continue;
QString subDir = baseDir + QChar('/') + file;
for (int i = subDir.length() - 1; i >= 0; --i) {
if (subDir.at(i) == QChar('/')) {
subDir = subDir.left(i);
break;
}
}
QString subDir = baseDir + QLatin1Char('/') + file;
const int lastSlashPos = subDir.lastIndexOf(QLatin1Char('/'));
if (lastSlashPos != -1)
subDir.truncate(lastSlashPos);
// Add folder nodes, that are not already available
oldParentFolder = parentFolder;