summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2021-07-14 00:50:29 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2021-07-17 02:23:17 +0200
commit0e7212460ba7fab19a47f960b09a011973a7c475 (patch)
tree6801ba8a3e6e43c1a924411b965248e6f7bc2f8a /src/widgets
parent8ebd4a1da820cff0e499258f79a3fc139ea06b77 (diff)
Use member function instead of template function to resolve native interface
The use of a freestanding function is not needed now that the name doesn't alias the nativeInterface accessor function, and was just adding complexity to the machinery. People not familiar with the code will have an easier time following the flow through the helper member function, and we no longer need to declare our own export macros. Pick-to: 6.2 Change-Id: I17530b7e89939cfc19ab8ffaa076b7129ae02dcf Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/kernel/qapplication.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index fb88142076..25afb8b9b1 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -4101,10 +4101,9 @@ QPixmap QApplicationPrivate::applyQIconStyleHelper(QIcon::Mode mode, const QPixm
return QApplication::style()->generatedIconPixmap(mode, base, &opt);
}
-template <>
-Q_NATIVE_INTERFACE_EXPORT void *QNativeInterface::Private::resolveInterface(const QApplication *that, const char *name, int revision)
+void *QApplication::resolveInterface(const char *name, int revision) const
{
- return resolveInterface<QGuiApplication>(that, name, revision);
+ return QGuiApplication::resolveInterface(name, revision);
}
QT_END_NAMESPACE