[neon/qt/qtbase/Neon/testing] debian: qmake cross wrapper: Allow passing -qt5.

[Dmitry Shachnev]

Git commit 5fdf541386fcc8e0c7c0d85efff99d83c1982f29 by Dmitry Shachnev, on behalf of Helmut Grohne.
Committed on 24/10/2020 at 18:10.
Pushed by sitter into branch 'Neon/testing'.

qmake cross wrapper: Allow passing -qt5.

Closes: #972640.

M  +3    -0    debian/changelog
M  +4    -0    debian/qmake-cross-wrapper.in

https://invent.kde.org/neon/qt/qtbase/commit/5fdf541386fcc8e0c7c0d85efff99d83c1982f29

diff --git a/debian/changelog b/debian/changelog
index 5d92521..ee77333 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ qtbase-opensource-src (5.15.1+dfsg-2) UNRELEASED; urgency=medium
   * Remove qt5-default. Nowadays it's not needed as Qt 5 is the only Qt version
     in Debian and it brought more problems than solutions.
 
+  [ Helmut Grohne ]
+  * qmake cross wrapper: Allow passing -qt5. (Closes: #972640)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Sep 2020 20:54:35 +0300
 
 qtbase-opensource-src (5.15.1+dfsg-1) experimental; urgency=medium
diff --git a/debian/qmake-cross-wrapper.in b/debian/qmake-cross-wrapper.in
index d150f61..035ddb3 100644
--- a/debian/qmake-cross-wrapper.in
+++ b/debian/qmake-cross-wrapper.in
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+if [ "x$1" = x-qt5 ] || [ "x$1" = "x-qt=5" ] || [ "x$1" = "x-qt=qt5" ]; then
+	shift
+fi
+
 QMAKE_MODE=
 
 if [ "x$1" = x-query ]; then