summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/integrity/gbuild.cpp1
-rw-r--r--qmake/generators/mac/pbuilder_pbx.cpp1
-rw-r--r--qmake/option.cpp9
3 files changed, 6 insertions, 5 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp
index 8a3a75b7d9..e8e992b694 100644
--- a/qmake/generators/integrity/gbuild.cpp
+++ b/qmake/generators/integrity/gbuild.cpp
@@ -417,6 +417,7 @@ QString GBuildMakefileGenerator::writeOne(QString filename, QString pathtoremove
bool
GBuildMakefileGenerator::openOutput(QFile &file, const QString &build) const
{
+ Q_UNUSED(build)
debug_msg(1, "file is %s", file.fileName().toLatin1().constData());
QFileInfo fi(file);
if (fi.filePath().isEmpty())
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 68338a6684..5ea1ff14b9 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -1797,6 +1797,7 @@ ProjectBuilderMakefileGenerator::reftypeForFile(const QString &where)
QString ProjectBuilderMakefileGenerator::sourceTreeForFile(const QString &where)
{
+ Q_UNUSED(where)
// We always use absolute paths, instead of maintaining the SRCROOT
// build variable and making files relative to that.
return QLatin1String("<absolute>");
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 86d55835f8..7b93144d82 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -531,12 +531,11 @@ Option::fixString(QString string, uchar flags)
string = QDir::cleanPath(string);
}
- bool localSep = (flags & Option::FixPathToLocalSeparators) != 0;
- bool targetSep = (flags & Option::FixPathToTargetSeparators) != 0;
- bool normalSep = (flags & Option::FixPathToNormalSeparators) != 0;
-
// either none or only one active flag
- Q_ASSERT(localSep + targetSep + normalSep <= 1);
+ Q_ASSERT(((flags & Option::FixPathToLocalSeparators) != 0) +
+ ((flags & Option::FixPathToTargetSeparators) != 0) +
+ ((flags & Option::FixPathToNormalSeparators) != 0) <= 1);
+
//fix separators
if (flags & Option::FixPathToNormalSeparators) {
string = string.replace('\\', '/');