summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android/qandroidplatformintegration.cpp
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2023-09-17 12:40:40 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2023-09-22 07:18:16 +0200
commite1a349983c93143211342d34c458d2bb06986971 (patch)
treeff36c488bbe4741f619bdd2005576221eb753ed5 /src/plugins/platforms/android/qandroidplatformintegration.cpp
parent0022b05a9a222912ed91f658c058dff6955d2de4 (diff)
JNI: move signature/className template functions into a template class
Template functions don't permit partial specialization, e.g. we cannot specialize typeSignature() to return an array signature for any std::vector or QList type. We need to do that for better array support, so move those functions as static members into a template class, which then can be specialized. Since submodules are both calling and specializing typeSignature and className as template functions, keep and use those until the porting is complete. Change-Id: I74ec957fc41f78046cd9d0f803d8cc9d1e56672b Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io> Reviewed-by: Zoltan Gera <zoltan.gera@qt.io> Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformintegration.cpp')
-rw-r--r--src/plugins/platforms/android/qandroidplatformintegration.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformintegration.cpp b/src/plugins/platforms/android/qandroidplatformintegration.cpp
index 7e509ecf3a0..bf6dc85a06b 100644
--- a/src/plugins/platforms/android/qandroidplatformintegration.cpp
+++ b/src/plugins/platforms/android/qandroidplatformintegration.cpp
@@ -66,7 +66,7 @@ namespace {
QAndroidPlatformScreen* createScreenForDisplayId(int displayId)
{
const QJniObject display = QJniObject::callStaticObjectMethod<QtJniTypes::Display>(
- QtJniTypes::className<QtJniTypes::QtNative>(),
+ QtJniTypes::Traits<QtJniTypes::QtNative>::className(),
"getDisplay",
displayId);
if (!display.isValid())
@@ -184,10 +184,10 @@ QAndroidPlatformIntegration::QAndroidPlatformIntegration(const QStringList &para
qFatal("Could not bind GL_ES API");
m_primaryDisplayId = QJniObject::getStaticField<jint>(
- QtJniTypes::className<QtJniTypes::Display>(), "DEFAULT_DISPLAY");
+ QtJniTypes::Traits<QtJniTypes::Display>::className(), "DEFAULT_DISPLAY");
const QJniObject nativeDisplaysList = QJniObject::callStaticObjectMethod<QtJniTypes::List>(
- QtJniTypes::className<QtJniTypes::QtNative>(),
+ QtJniTypes::Traits<QtJniTypes::QtNative>::className(),
"getAvailableDisplays");
const int numberOfAvailableDisplays = nativeDisplaysList.callMethod<jint>("size");