diff options
Diffstat (limited to 'qmake/generators/win32/winmakefile.cpp')
-rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 30d28e6e11..de243e4394 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -89,12 +89,12 @@ Win32MakefileGenerator::findHighestVersion(const QString &d, const QString &stem QRegExp regx(QString("((lib)?%1([0-9]*)).(%2|prl)$").arg(stem).arg(ext), Qt::CaseInsensitive); for(QStringList::Iterator it = entries.begin(); it != entries.end(); ++it) { if(regx.exactMatch((*it))) { - if (!regx.cap(3).isEmpty()) { - bool ok = true; - int num = regx.cap(3).toInt(&ok); - biggest = qMax(biggest, (!ok ? -1 : num)); - } - } + if (!regx.cap(3).isEmpty()) { + bool ok = true; + int num = regx.cap(3).toInt(&ok); + biggest = qMax(biggest, (!ok ? -1 : num)); + } + } } } if(libInfoRead @@ -485,20 +485,20 @@ void Win32MakefileGenerator::processRcFileVar() rcFile.close(); } if (writeRcFile) { - bool ok; - ok = rcFile.open(QFile::WriteOnly); - if (!ok) { - // The file can't be opened... try creating the containing - // directory first (needed for clean shadow builds) - QDir().mkpath(QFileInfo(rcFile).path()); - ok = rcFile.open(QFile::WriteOnly); - } - if (!ok) { - ::fprintf(stderr, "Cannot open for writing: %s", rcFile.fileName().toLatin1().constData()); - ::exit(1); - } - rcFile.write(rcString); - rcFile.close(); + bool ok; + ok = rcFile.open(QFile::WriteOnly); + if (!ok) { + // The file can't be opened... try creating the containing + // directory first (needed for clean shadow builds) + QDir().mkpath(QFileInfo(rcFile).path()); + ok = rcFile.open(QFile::WriteOnly); + } + if (!ok) { + ::fprintf(stderr, "Cannot open for writing: %s", rcFile.fileName().toLatin1().constData()); + ::exit(1); + } + rcFile.write(rcString); + rcFile.close(); } if (project->values("QMAKE_WRITE_DEFAULT_RC").isEmpty()) project->values("RC_FILE").insert(0, rcFile.fileName()); @@ -530,7 +530,7 @@ void Win32MakefileGenerator::processRcFileVar() } project->values("RES_FILE").first() = Option::fixPathToTargetOS( project->values("RES_FILE").first().toQString(), false, false); - project->values("POST_TARGETDEPS") += project->values("RES_FILE"); + project->values("POST_TARGETDEPS") += project->values("RES_FILE"); project->values("CLEAN_FILES") += project->values("RES_FILE"); } } |