Merge v2.0.1 into community

Governikus · Nov 8, 2023 · e7829ba · e7829ba
2 parents 38b050d + 5f812fb
commit e7829ba
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ if(UNIX AND NOT IOS)
  set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0 CACHE STRING "Required macOS version")
 endif()
 
-project(AusweisApp VERSION 2.0.0 LANGUAGES ${LANGUAGES})
+project(AusweisApp VERSION 2.0.1 LANGUAGES ${LANGUAGES})
 
 # Set TWEAK if not defined in PROJECT_VERSION above to
 # have a valid tweak version without propagating it

diff --git a/docs/releasenotes/2.0.1.rst b/docs/releasenotes/2.0.1.rst
@@ -0,0 +1,14 @@
+AusweisApp 2.0.1
+^^^^^^^^^^^^^^^^
+
+**Releasedatum:** 8. November 2023
+
+
+Anwender
+""""""""
+- Vermeidung des Verlusts der Einstellungen auf iOS und macOS.
+
+
+Entwickler
+""""""""""
+- Entitlements unter macOS korrigiert.
diff --git a/docs/releasenotes/versions.rst b/docs/releasenotes/versions.rst
@@ -6,6 +6,7 @@ Versionszweig 2.0
 .. toctree::
  :maxdepth: 1
 
+ 2.0.1
  2.0.0
 
 

diff --git a/resources/packaging/macos/AusweisApp.entitlements b/resources/packaging/macos/AusweisApp.entitlements
@@ -12,9 +12,5 @@
  <true/>
  <key>com.apple.security.network.server</key>
  <true/>
- <key>com.apple.security.temporary-exception.shared-preference.read-only</key>
- <array>
- <string>/Library/Preferences/com.governikus.AusweisApp2.plist</string>
- </array>
 </dict>
 </plist>
diff --git a/src/settings/AbstractSettings.cpp b/src/settings/AbstractSettings.cpp
@@ -44,5 +44,13 @@ QSharedPointer<QSettings> AbstractSettings::getStore(const QString& pFilename, Q
 #endif
 
  Q_ASSERT(pFilename.isEmpty() == (pFormat == QSettings::InvalidFormat));
- return pFilename.isEmpty() ? QSharedPointer<QSettings>::create(QCoreApplication::organizationName(), QStringLiteral("AusweisApp2")) : QSharedPointer<QSettings>::create(pFilename, pFormat);
+#if defined(Q_OS_IOS) || defined(Q_OS_MACOS)
+ const auto& organization = QCoreApplication::organizationDomain();
+
+#else
+ const auto& organization = QCoreApplication::organizationName();
+
+#endif
+
+ return pFilename.isEmpty() ? QSharedPointer<QSettings>::create(organization, QStringLiteral("AusweisApp2")) : QSharedPointer<QSettings>::create(pFilename, pFormat);
 }