Merge v1.26.1 into community

CMakeLists.txt

@@ -60,7 +60,7 @@ if(UNIX AND NOT IOS)
 	set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "Required macOS version")
 endif()
 
-project(AusweisApp2 VERSION 1.26.0 LANGUAGES ${LANGUAGES})
+project(AusweisApp2 VERSION 1.26.1 LANGUAGES ${LANGUAGES})
 
 # Set TWEAK if not defined in PROJECT_VERSION above to
 # have a valid tweak version without propagating it

docs/releasenotes/1.26.1.rst

@@ -0,0 +1,16 @@
+AusweisApp2 1.26.1
+^^^^^^^^^^^^^^^^^^
+
+**Releasedatum:** 15. Dezember 2022
+
+
+Anwender
+""""""""
+- Vermeidung des Verlusts der Einstellungen auf Android.
+
+
+Entwickler
+""""""""""
+- Vermeidung der Verwendung von nicht öffentlichen oder
+  veralteten APIs auf macOS zur Einhaltung der App Store
+  Guidelines.

docs/releasenotes/appcast.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
    :maxdepth: 1
 
+   1.26.1
    1.26.0
    announce
    issues

docs/releasenotes/versions.rst

@@ -6,6 +6,7 @@ Versionszweig 1.26
 .. toctree::
    :maxdepth: 1
 
+   1.26.1
    1.26.0
 
 

libs/CMakeLists.txt

@@ -375,6 +375,10 @@ endforeach()
 
 set(QT_CONFIGURE_FLAGS_OTHER -no-journald -no-directfb -no-linuxfb)
 set(QT_CONFIGURE configure)
+
+if(APPLE)
+	set(QT_CONFIGURE_FLAGS ${QT_CONFIGURE_FLAGS} -appstore-compliant)
+endif()
 if(IOS)
 	set(QT_CONFIGURE_FLAGS ${QT_CONFIGURE_FLAGS} ${QT_CONFIGURE_FLAGS_OTHER} -xplatform macx-ios-clang)
 

libs/patches/qt-base-0002-Revert-Android-Fix-QSettings-when-using-content-URL.patch

@@ -0,0 +1,66 @@
+From c6818d0c25f067bc13198b9aa2ca82776a40ad3b Mon Sep 17 00:00:00 2001
+From: Lars Schmertmann <[email protected]>
+Date: Wed, 14 Dec 2022 11:52:12 +0100
+Subject: Revert "Android: Fix QSettings when using content URL"
+
+This reverts commit 140ca89a3c2b8d78889d27217f977cd4de10041b.
+---
+ src/corelib/io/qsettings.cpp | 21 +++------------------
+ 1 file changed, 3 insertions(+), 18 deletions(-)
+
+diff --git x/qtbase/src/corelib/io/qsettings.cpp y/qtbase/src/corelib/io/qsettings.cpp
+index 60622e3aaa..a999aa6996 100644
+--- x/qtbase/src/corelib/io/qsettings.cpp
++++ y/qtbase/src/corelib/io/qsettings.cpp
+@@ -48,9 +48,8 @@
+ #define Q_XDG_PLATFORM
+ #endif
+
+-#if !defined(QT_NO_STANDARDPATHS)                                                                  \
+-        && (defined(Q_XDG_PLATFORM) || defined(QT_PLATFORM_UIKIT) || defined(Q_OS_ANDROID))
+-#    define QSETTINGS_USE_QSTANDARDPATHS
++#if !defined(QT_NO_STANDARDPATHS) && (defined(Q_XDG_PLATFORM) || defined(QT_PLATFORM_UIKIT))
++#define QSETTINGS_USE_QSTANDARDPATHS
+ #endif
+
+ // ************************************************************************
+@@ -1332,15 +1331,6 @@ void QConfFileSettingsPrivate::syncConfFile(QConfFile *confFile)
+     }
+
+ #ifndef QT_BOOTSTRAPPED
+-    QString lockFileName = confFile->name + ".lock"_L1;
+-
+-#    if defined(Q_OS_ANDROID) && defined(QSETTINGS_USE_QSTANDARDPATHS)
+-    // On android and if it is a content URL put the lock file in a
+-    // writable location to prevent permissions issues and invalid paths.
+-    if (confFile->name.startsWith("content:"_L1))
+-        lockFileName = QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
+-                + QFileInfo(lockFileName).fileName();
+-#    endif
+     /*
+         Use a lockfile in order to protect us against other QSettings instances
+         trying to write the same settings at the same time.
+@@ -1348,7 +1338,7 @@ void QConfFileSettingsPrivate::syncConfFile(QConfFile *confFile)
+         We only need to lock if we are actually writing as only concurrent writes are a problem.
+         Concurrent read and write are not a problem because the writing operation is atomic.
+     */
+-    QLockFile lockFile(lockFileName);
++    QLockFile lockFile(confFile->name + ".lock"_L1);
+     if (!readOnly && !lockFile.lock() && atomicSyncOnly) {
+         setStatus(QSettings::AccessError);
+         return;
+@@ -1426,11 +1416,6 @@ void QConfFileSettingsPrivate::syncConfFile(QConfFile *confFile)
+ #if !defined(QT_BOOTSTRAPPED) && QT_CONFIG(temporaryfile)
+         QSaveFile sf(confFile->name);
+         sf.setDirectWriteFallback(!atomicSyncOnly);
+-#    ifdef Q_OS_ANDROID
+-        // QSaveFile requires direct write when using content scheme URL in Android
+-        if (confFile->name.startsWith("content:"_L1))
+-            sf.setDirectWriteFallback(true);
+-#    endif
+ #else
+         QFile sf(confFile->name);
+ #endif
+-- 
+2.39.0
+