diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-01-28 13:41:17 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-02-05 11:57:34 -0800 |
| commit | 8058127a9df0b66f28908f42e4f533165468de95 (patch) | |
| tree | 255a50de76ee5e9bed342f6875d41f0f0ed1600b /qmake | |
| parent | 8b87c6f1989754aa37aa2a6794954df68d3374d5 (diff) | |
QLibraryInfo: remove load-time variable
Since this is only used by qtpaths and qmake, let's not make every
application pay the price of dynamically initializing a QString whenever
QtCore is loaded (which 100% of Qt applications do). Instead,
initializing a null pointer costs zero and is one third the size of
QString. Even the assignment in qmake and qtpaths is faster this way.
Pick-to: 6.3
Change-Id: I6fcda969a9e9427198bffffd16ce8d1eb8dc19da
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'qmake')
| -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 99a8922cf6..e9807a15b5 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -211,7 +211,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); |