Now the QT4 version of qmake can be explicitly selected by passing --buildsystem...

There is that build system option patch that I suckily never applied,
and could be used here.. but this is at its core a different build system,
and so handling it as such makes the most sense.

It may make sense to have a qmake_qt3 build system, but perhaps QT 3
will instead just go away. I considered just waiting, but this is an easy
fix. ;)

diff --git a/Debian/Debhelper/Buildsystem/qmake.pm b/Debian/Debhelper/Buildsystem/qmake.pm
index 4e67f918e780561d586a67de0713ac32331a85ae..521013b350752e1a230ede333ce57d5c85e73424 100644 (file)
--- a/Debian/Debhelper/Buildsystem/qmake.pm
+++ b/Debian/Debhelper/Buildsystem/qmake.pm
@@ -11,6 +11,8 @@ use warnings;
 use Debian::Debhelper::Dh_Lib qw(error);
 use base 'Debian::Debhelper::Buildsystem::makefile';
 
+our $qmake="qmake";
+
 sub DESCRIPTION {
        "qmake (*.pro)";
 }
@@ -66,7 +68,7 @@ sub configure {
        push @flags, "QMAKE_STRIP=:";
        push @flags, "PREFIX=/usr";
 
-       $this->doit_in_builddir('qmake', @options, @flags, @_);
+       $this->doit_in_builddir($qmake, @options, @flags, @_);
 }
 
 sub install {

diff --git a/Debian/Debhelper/Buildsystem/qmake_qt4.pm b/Debian/Debhelper/Buildsystem/qmake_qt4.pm
new file mode 100644 (file)
index 0000000..1bc9fe6
--- /dev/null
+++ b/Debian/Debhelper/Buildsystem/qmake_qt4.pm
@@ -0,0 +1,14 @@
+package Debian::Debhelper::Buildsystem::qmake_qt4;
+
+use strict;
+use warnings;
+use Debian::Debhelper::Dh_Lib qw(error);
+use base 'Debian::Debhelper::Buildsystem::qmake';
+
+$Debian::Debhelper::Buildsystem::qmake::qmake="qmake-qt4";
+
+sub DESCRIPTION {
+       "qmake for QT 4 (*.pro)";
+}
+
+1

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index 9c3fc0597c969b6639d8355c46a2ad21b266584d..405b79c610f8d0617326258f17d0783c196f28dc 100644 (file)
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -28,6 +28,7 @@ our @BUILDSYSTEMS = (
        "cmake",
        "ant",
        "qmake",
+       "qmake_qt4",
 );
 
 my $opt_buildsys;

diff --git a/debian/changelog b/debian/changelog
index 71fd85e96fa92371ee14e5df497e18a8eacd08da..c8880217a24632edd05ab8834bf177a963060002 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ debhelper (8.9.1) UNRELEASED; urgency=low
 
   * Typo fixes. Closes: #632662
   * dh: In v9, do not enable any python support commands. Closes: #634106
+  * Now the QT4 version of qmake can be explicitly selected by passing
+    --buildsystem=qmake_qt4. Closes: #566840
 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jul 2011 12:16:48 -0400