summaryrefslogtreecommitdiff
path: root/Debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-07-16 22:11:02 -0400
committerJoey Hess <joey@kitenet.net>2011-07-16 22:11:11 -0400
commit73c921d8e22c0d5d0894f321cd5b22ec9d6dab01 (patch)
treebfff752aecd672f063bcc6187b62981a2f0858fd /Debian
parent3c64646fe484cc9bbb643feaa3b85eb69985cff7 (diff)
Now the QT4 version of qmake can be explicitly selected by passing --buildsystem=qmake_qt4. Closes: #566840
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. ;)
Diffstat (limited to 'Debian')
-rw-r--r--Debian/Debhelper/Buildsystem/qmake.pm4
-rw-r--r--Debian/Debhelper/Buildsystem/qmake_qt4.pm14
-rw-r--r--Debian/Debhelper/Dh_Buildsystems.pm1
3 files changed, 18 insertions, 1 deletions
diff --git a/Debian/Debhelper/Buildsystem/qmake.pm b/Debian/Debhelper/Buildsystem/qmake.pm
index 4e67f91..521013b 100644
--- 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
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 9c3fc05..405b79c 100644
--- 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;