Skip to content

Commit

Permalink
Add revision: v1.26.7
Browse files Browse the repository at this point in the history
  • Loading branch information
GovernikusAusweisApp2 committed Jul 28, 2023
1 parent aef2e0a commit c3ecd07
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.6 LANGUAGES ${LANGUAGES})
project(AusweisApp2 VERSION 1.26.7 LANGUAGES ${LANGUAGES})

# Set TWEAK if not defined in PROJECT_VERSION above to
# have a valid tweak version without propagating it
Expand Down
13 changes: 13 additions & 0 deletions docs/releasenotes/1.26.7.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
AusweisApp2 1.26.7
^^^^^^^^^^^^^^^^^^

**Releasedatum:** 28. Juli 2023


Anwender
""""""""
- Ein möglicher Absturz beim Start unter Android wurde behoben.


Entwickler
""""""""""
1 change: 1 addition & 0 deletions docs/releasenotes/appcast.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Release Notes
.. toctree::
:maxdepth: 1

1.26.7
1.26.6
1.26.5
1.26.4
Expand Down
1 change: 1 addition & 0 deletions docs/releasenotes/versions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Versionszweig 1.26
.. toctree::
:maxdepth: 1

1.26.7
1.26.6
1.26.5
1.26.4
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From bdc4845cd844e674f17161435a11e60dde2769cc Mon Sep 17 00:00:00 2001
From f0f55fda3a29ca4f53fcd9d93476e5658cf6f9f4 Mon Sep 17 00:00:00 2001
From: Jens Trillmann <[email protected]>
Date: Wed, 5 Jul 2023 09:33:03 +0200
Subject: Improve Intent source app detection
Expand All @@ -17,7 +17,7 @@ Change-Id: I33d1edd52de98486d9616713e531ea20ada87bcb
1 file changed, 12 insertions(+), 3 deletions(-)

diff --git x/qtbase/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java y/qtbase/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
index 9cef8146fd..f862f6aaee 100644
index 9cef8146fd..c22a4f4278 100644
--- x/qtbase/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
+++ y/qtbase/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
@@ -16,6 +16,7 @@ import android.graphics.Canvas;
Expand All @@ -36,7 +36,7 @@ index 9cef8146fd..f862f6aaee 100644
- if (referrer != null)
- sourceInformation = referrer.toString().replaceFirst("android-app://", "");
+ String browserApplicationId = intent.getExtras() == null ? "" : intent.getExtras().getString(Browser.EXTRA_APPLICATION_ID);
+ if (!browserApplicationId.isEmpty())
+ if (browserApplicationId != null && !browserApplicationId.isEmpty())
+ {
+ sourceInformation = browserApplicationId;
+ }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f9a1c8668e5f4787e9b0b3136076138f4fda5563 Mon Sep 17 00:00:00 2001
From da582e1a6ca1ed0dbdb63f95749bef5c44ef401d Mon Sep 17 00:00:00 2001
From: Ahmad Samir <[email protected]>
Date: Wed, 12 Apr 2023 13:10:26 +0200
Subject: QXmlStreamReader: change fastScanName() to take a Value*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 836d7df23ec9b6cb3dea1bb68b7c8bc75090702e Mon Sep 17 00:00:00 2001
From ecf9967e196afa80bb3117d794387aba8b536f32 Mon Sep 17 00:00:00 2001
From: Ahmad Samir <[email protected]>
Date: Thu, 22 Jun 2023 15:56:07 +0300
Subject: QXmlStreamReader: make fastScanName() indicate parsing status to
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6f79fea4b7ee471adbed09d7e4b6da688a571c80 Mon Sep 17 00:00:00 2001
From 472133b864b04e359aba2f5db1f1b1fe2890121a Mon Sep 17 00:00:00 2001
From: Sona Kurazyan <[email protected]>
Date: Fri, 2 Sep 2022 16:52:04 +0200
Subject: QXmlStreamReader: use qOffsetStringArray for storing token types
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ce9ffbc726f7a0d90561db7206f3061371126190 Mon Sep 17 00:00:00 2001
From 625af289b43f8e665b83eb4c86aeef91140e59ab Mon Sep 17 00:00:00 2001
From: Axel Spoerl <[email protected]>
Date: Fri, 30 Jun 2023 12:43:59 +0200
Subject: QXmlStreamReader: Raise error on unexpected tokens
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e6d25e8d3b67cf7d9601d3fdd07131280f8ff056 Mon Sep 17 00:00:00 2001
From 335a97b94afdfe8c0156ac3d3a0dab8ec784f00d Mon Sep 17 00:00:00 2001
From: Marc Mutz <[email protected]>
Date: Sun, 4 Sep 2022 12:31:10 +0200
Subject: QOffsetStringArray: fix ambiguous qOffsetStringArray overloads
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 72533c561d6952e63f86f11d9e4f0c6ffe8ed5a1 Mon Sep 17 00:00:00 2001
From 5d3108ae7f32a0489833d358aced86cb27184d49 Mon Sep 17 00:00:00 2001
From: Marc Mutz <[email protected]>
Date: Mon, 5 Sep 2022 08:59:23 +0200
Subject: QOffsetStringArray: fix size_t/qsizetype mismatch
Expand Down

0 comments on commit c3ecd07

Please sign in to comment.