diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-03-17 12:09:56 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-18 07:20:15 +0000 |
| commit | 923db4ec23e0839b15029170ed5cc0effa30e88c (patch) | |
| tree | 7943e162694e11b467224d660a56363dc310638f | |
| parent | 726b65ba86759c7fef5cbfc8af0d5e8a0bd4f1e4 (diff) | |
QMetaType: remove an unused static pointer variable
Unlike the Gui and Widgets pointers, the Core one wasn't needed,
because the only user can inline the variables contents.
Saves one relocation.
Change-Id: Ib7535e1a29c5125eea55c66dad6d2d1de72f6bc1
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 7ed5b52e80df7007a2e3197cff198988b95d9525)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 52b1442aae..b7ee2d9a8e 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -1552,14 +1552,13 @@ static const struct : QMetaTypeModuleHelper } } metatypeHelper = {}; -static const QMetaTypeModuleHelper *qMetaTypeCoreHelper = &metatypeHelper; Q_CORE_EXPORT const QMetaTypeModuleHelper *qMetaTypeGuiHelper = nullptr; Q_CORE_EXPORT const QMetaTypeModuleHelper *qMetaTypeWidgetsHelper = nullptr; static const QMetaTypeModuleHelper *qModuleHelperForType(int type) { if (type <= QMetaType::LastCoreType) - return qMetaTypeCoreHelper; + return &metatypeHelper; if (type >= QMetaType::FirstGuiType && type <= QMetaType::LastGuiType) return qMetaTypeGuiHelper; else if (type >= QMetaType::FirstWidgetsType && type <= QMetaType::LastWidgetsType) |