Merge branch 'frankosterfeld:main' into master

Mudlet · May 12, 2023 · ea7e748 · ea7e748
2 parents 7372d54 + 96d2f84
commit ea7e748
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 
-set(QTKEYCHAIN_VERSION 0.13.99)
+set(QTKEYCHAIN_VERSION 0.14.99)
 set(QTKEYCHAIN_SOVERSION 1)
 
 project(qtkeychain VERSION ${QTKEYCHAIN_VERSION} LANGUAGES CXX)

diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,14 @@
 ChangeLog
 =========
 
+version 0.14.0 (release 2023-05-12)
+
+ - Add Qt 6 Android support (Igor Bugaev <freedbrt@gmail.com>)
+ - Add QtQuick client example ((Igor Bugaev <freedbrt@gmail.com>)
+ - Added Dutch translation (Heimen Stoffels <vistausss@fastmail.com>)
+ - Fix potential freezing with Apple keychain (Claudio Cambra <developer@claudiocambra.com>)
+ - Add API to check whether a secure backend is available at all (Volker Krause <vkrause@kde.org>)
+
 version 0.13.2 (release 2021-11-18)
 
  - CMake: Deprecate QTKEYCHAIN_STATIC in favor of BUILD_SHARED_LIBS (be@mixxx.org)

diff --git a/androidkeystore.cpp b/androidkeystore.cpp
@@ -115,7 +115,7 @@ bool KeyStore::containsAlias(const QString &alias) const
 
 bool KeyStore::deleteEntry(const QString &alias) const
 {
-    callMethod<void>("deleteEntry", "(Ljava/lang/String;)Z", fromString(alias).object());
+    callMethod<void>("deleteEntry", "(Ljava/lang/String;)V", fromString(alias).object());
     return handleExceptions();
 }
 

diff --git a/keychain_android.cpp b/keychain_android.cpp
@@ -106,9 +106,9 @@ void WritePasswordJobPrivate::scheduledStart()
             #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
                 KeyPairGeneratorSpec::Builder(Context(QtAndroid::androidActivity())).
             #elif QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
-                KeyPairGeneratorSpec::Builder(QNativeInterface::QAndroidApplication::context()).
+                KeyPairGeneratorSpec::Builder(Context(QNativeInterface::QAndroidApplication::context())).
             #else
-                KeyPairGeneratorSpec::Builder((jobject)QNativeInterface::QAndroidApplication::context()).
+                KeyPairGeneratorSpec::Builder(Context((jobject)QNativeInterface::QAndroidApplication::context())).
             #endif
                 setAlias(alias).
                 setSubject(X500Principal(QStringLiteral("CN=QtKeychain, O=Android Authority"))).