diff options
Diffstat (limited to 'qmake/option.cpp')
-rw-r--r-- | qmake/option.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 72edf9c271..f5fa85708e 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -208,7 +208,8 @@ Option::parseCommandLine(QStringList &args, QMakeCmdLineParserState &state) fprintf(stderr, "***Option %s requires a parameter\n", qPrintable(args.at(x - 1))); return Option::QMAKE_CMDLINE_SHOW_USAGE | Option::QMAKE_CMDLINE_ERROR; } - QLibraryInfoPrivate::qtconfManualPath = globals->qtconf; + if (!globals->qtconf.isEmpty()) + QLibraryInfoPrivate::qtconfManualPath = &globals->qtconf; if (cmdRet == QMakeGlobals::ArgumentsOk) break; Q_ASSERT(cmdRet == QMakeGlobals::ArgumentUnknown); |