[SCM] qtbase packaging branch, master, updated. debian/5.9.2+dfsg-7-2-g0470f59

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=0470f59

The following commit has been merged in the master branch:
commit 0470f597f385d4b9d84cf21cc89ac05d1eac53c7
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jan 31 23:29:39 2018 +0300

    qmake-cross-wrapper: Add special handling of -makefile and -project flags.
---
 debian/changelog              | 2 ++
 debian/qmake-cross-wrapper.in | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ea235da..5dff32c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtbase-opensource-src (5.9.2+dfsg-8) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * qmake-cross-wrapper: Add special handling of -makefile and -project flags.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 31 Jan 2018 23:28:45 +0300
 
diff --git a/debian/qmake-cross-wrapper.in b/debian/qmake-cross-wrapper.in
index 91cf85e..1d07574 100644
--- a/debian/qmake-cross-wrapper.in
+++ b/debian/qmake-cross-wrapper.in
@@ -1,10 +1,16 @@
 #!/bin/sh
 
+QMAKE_MODE=
+
 if [ "x$1" = x-query ]; then
 	exec /usr/lib/qt5/bin/qmake "$@" -qtconf /usr/lib/@DEB_HOST_MULTIARCH@/qt5/qt.conf
+elif [ "x$1" = x-makefile ] || [ "x$1" = x-project ]; then
+	QMAKE_MODE="$1"
+	shift
 fi
 
 exec /usr/lib/qt5/bin/qmake \
+	$QMAKE_MODE \
 	-qtconf /usr/lib/@DEB_HOST_MULTIARCH@/qt5/qt.conf \
 	-early \
 	QMAKE_CC=${CC:- at DEB_HOST_GNU_TYPE@-gcc} \

-- 
qtbase packaging