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 | |
| 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>
| -rw-r--r-- | qmake/option.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo_p.h | 2 | ||||
| -rw-r--r-- | src/tools/qtpaths/qtpaths.cpp | 4 |
4 files changed, 9 insertions, 6 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); diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 52d967ef37..a4764713c4 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -123,8 +123,8 @@ void QLibrarySettings::load() static QSettings *findConfiguration() { - if (!QLibraryInfoPrivate::qtconfManualPath.isEmpty()) - return new QSettings(QLibraryInfoPrivate::qtconfManualPath, QSettings::IniFormat); + if (QLibraryInfoPrivate::qtconfManualPath) + return new QSettings(*QLibraryInfoPrivate::qtconfManualPath, QSettings::IniFormat); QString qtconfig = QStringLiteral(":/qt/etc/qt.conf"); if (QFile::exists(qtconfig)) @@ -156,7 +156,7 @@ static QSettings *findConfiguration() return nullptr; //no luck } -QString QLibraryInfoPrivate::qtconfManualPath; +const QString *QLibraryInfoPrivate::qtconfManualPath = nullptr; QSettings *QLibraryInfoPrivate::configuration() { diff --git a/src/corelib/global/qlibraryinfo_p.h b/src/corelib/global/qlibraryinfo_p.h index caed0feb84..f335c0d01a 100644 --- a/src/corelib/global/qlibraryinfo_p.h +++ b/src/corelib/global/qlibraryinfo_p.h @@ -67,7 +67,7 @@ public: #if QT_CONFIG(settings) static QSettings *configuration(); static void reload(); - static QString qtconfManualPath; + static const QString *qtconfManualPath; #endif struct LocationInfo diff --git a/src/tools/qtpaths/qtpaths.cpp b/src/tools/qtpaths/qtpaths.cpp index f9643ad3fe..7078532c32 100644 --- a/src/tools/qtpaths/qtpaths.cpp +++ b/src/tools/qtpaths/qtpaths.cpp @@ -170,6 +170,7 @@ static QString searchStringOrError(QCommandLineParser *parser) int main(int argc, char **argv) { + QString qtconfManualPath; QCoreApplication app(argc, argv); app.setApplicationVersion(QTPATHS_VERSION_STR); @@ -267,7 +268,8 @@ int main(int argc, char **argv) #if QT_CONFIG(settings) if (parser.isSet(qtconf)) { - QLibraryInfoPrivate::qtconfManualPath = parser.value(qtconf); + qtconfManualPath = parser.value(qtconf); + QLibraryInfoPrivate::qtconfManualPath = &qtconfManualPath; } #endif |