summaryrefslogtreecommitdiffstats
path: root/qmake/option.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-10-31 16:15:51 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-04 19:50:05 +0100
commit8a5657b9f721bb2301358080353e1d6f3fcf2174 (patch)
tree74baf6d1fd31d541d42ddcef353c7d4f70a87e03 /qmake/option.cpp
parent9dd2b32e9aede824eed1fa37ef143a6421db04fe (diff)
fix warnings about unused variables & parameters
Change-Id: Ia5816671267ea21dae0d90560b239c4498f9156c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/option.cpp')
-rw-r--r--qmake/option.cpp9
1 files changed, 4 insertions, 5 deletions
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('\\', '/');