From a8dc2a5b6dda85d63dd8f9f7570069df008941c6 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kde.org>
Date: Tue, 13 Oct 2020 18:49:50 +0300
Subject: Fix Qt6 renaming

Fixes sha: 1907599bfd817e00c7f42b8cb941ebf93a098e7f

Change-Id: I20ece75c321835f13a605ae4d56fee1a034ca7c8
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
---
 src/plugins/platforms/android/extract-dummy.cpp |  6 ++++--
 src/plugins/platforms/android/extract.cpp       | 10 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/platforms/android/extract-dummy.cpp b/src/plugins/platforms/android/extract-dummy.cpp
index fdce8ec64c..bfc0dafd04 100644
--- a/src/plugins/platforms/android/extract-dummy.cpp
+++ b/src/plugins/platforms/android/extract-dummy.cpp
@@ -40,12 +40,14 @@
 #include <jni.h>
 #include <extract.h>
 
-extern "C" JNIEXPORT jintArray JNICALL Java_org_qtproject_qt5_android_ExtractStyle_extractNativeChunkInfo20(JNIEnv *, jobject, long)
+extern "C" JNIEXPORT jintArray JNICALL
+Java_org_qtproject_qt_android_ExtractStyle_extractNativeChunkInfo20(JNIEnv *, jobject, long)
 {
     return 0;
 }
 
-extern "C" JNIEXPORT jintArray JNICALL Java_org_qtproject_qt5_android_ExtractStyle_extractChunkInfo20(JNIEnv *, jobject, jbyteArray)
+extern "C" JNIEXPORT jintArray JNICALL
+Java_org_qtproject_qt_android_ExtractStyle_extractChunkInfo20(JNIEnv *, jobject, jbyteArray)
 {
     return 0;
 }
diff --git a/src/plugins/platforms/android/extract.cpp b/src/plugins/platforms/android/extract.cpp
index acffa353f1..c68dae31e9 100644
--- a/src/plugins/platforms/android/extract.cpp
+++ b/src/plugins/platforms/android/extract.cpp
@@ -91,7 +91,8 @@ Res_png_9patch* Res_png_9patch::deserialize(const void* inData)
     return (Res_png_9patch*) inData;
 }
 
-extern "C" JNIEXPORT jintArray JNICALL Java_org_qtproject_qt5_android_ExtractStyle_extractNativeChunkInfo20(JNIEnv * env, jobject, long addr)
+extern "C" JNIEXPORT jintArray JNICALL
+Java_org_qtproject_qt_android_ExtractStyle_extractNativeChunkInfo20(JNIEnv *env, jobject, long addr)
 {
     Res_png_9patch20* chunk = reinterpret_cast<Res_png_9patch20*>(addr);
     Res_png_9patch20::deserialize(chunk);
@@ -123,7 +124,9 @@ extern "C" JNIEXPORT jintArray JNICALL Java_org_qtproject_qt5_android_ExtractSty
     return result;
 }
 
-extern "C" JNIEXPORT jintArray JNICALL Java_org_qtproject_qt5_android_ExtractStyle_extractChunkInfo20(JNIEnv * env, jobject  obj, jbyteArray chunkObj)
+extern "C" JNIEXPORT jintArray JNICALL
+Java_org_qtproject_qt_android_ExtractStyle_extractChunkInfo20(JNIEnv *env, jobject obj,
+                                                              jbyteArray chunkObj)
 {
     size_t chunkSize = env->GetArrayLength(chunkObj);
     void* storage = alloca(chunkSize);
@@ -131,7 +134,8 @@ extern "C" JNIEXPORT jintArray JNICALL Java_org_qtproject_qt5_android_ExtractSty
                             reinterpret_cast<jbyte*>(storage));
 
     if (!env->ExceptionCheck())
-        return Java_org_qtproject_qt5_android_ExtractStyle_extractNativeChunkInfo20(env, obj, long(storage));
+        return Java_org_qtproject_qt_android_ExtractStyle_extractNativeChunkInfo20(env, obj,
+                                                                                   long(storage));
     else
         env->ExceptionClear();
     return 0;
-- 
cgit v1.2.3