diff options
Diffstat (limited to 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index da52542a7d..7b93144d82 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -82,7 +82,6 @@ char Option::field_sep; Option::QMAKE_MODE Option::qmake_mode = Option::QMAKE_GENERATE_NOTHING; //all modes -QStringList Option::qmake_args; int Option::warn_level = WarnLogic | WarnDeprecated; int Option::debug_level = 0; QFile Option::output; @@ -436,7 +435,7 @@ Option::init(int argc, char **argv) return ret; //return ret == QMAKE_CMDLINE_SHOW_USAGE ? usage(argv[0]) : false; } - Option::qmake_args = args; + globals->qmake_args = args; } globals->commitCommandLineArguments(cmdstate); globals->debugLevel = Option::debug_level; @@ -532,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('\\', '/'); |