diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2024-02-27 17:57:05 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2024-02-28 14:02:43 +0000 |
| commit | bdb2f20154c1fa1f0962a46a22afdee453a2db1e (patch) | |
| tree | 4ee59b1ad2b91136064b9b278d173cfc4c78d013 /src/corelib/global/qlibraryinfo_p.h | |
| parent | b42f174cd5be2014ae74453ab2d09742cc83fc36 (diff) | |
Fix the qtpath issue with lto enabled
Move qtconfManualPath pointer to the unnamed namespace, so it's never
exported. Add the static setQtconfManualPath method that sets the
pointer at runtime.
Fixes: QTBUG-122739
Pick-to: 6.5 6.6 6.7
Change-Id: Icfc631f9680ad5f484920b0fdf3e408b7657c108
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qlibraryinfo_p.h')
| -rw-r--r-- | src/corelib/global/qlibraryinfo_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qlibraryinfo_p.h b/src/corelib/global/qlibraryinfo_p.h index d3c458290b..4b471b932e 100644 --- a/src/corelib/global/qlibraryinfo_p.h +++ b/src/corelib/global/qlibraryinfo_p.h @@ -32,7 +32,7 @@ public: #if QT_CONFIG(settings) static QSettings *configuration(); static void reload(); - static const QString *qtconfManualPath; + static void setQtconfManualPath(const QString *qtconfManualPath); #endif struct LocationInfo |