diff options
| author | Joey Hess <joey@kitenet.net> | 2011-07-16 22:11:02 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-07-16 22:11:11 -0400 |
| commit | 73c921d8e22c0d5d0894f321cd5b22ec9d6dab01 (patch) | |
| tree | bfff752aecd672f063bcc6187b62981a2f0858fd | |
| parent | 3c64646fe484cc9bbb643feaa3b85eb69985cff7 (diff) | |
| download | debhelper-73c921d8e22c0d5d0894f321cd5b22ec9d6dab01.tar.gz | |
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. ;)
| -rw-r--r-- | Debian/Debhelper/Buildsystem/qmake.pm | 4 | ||||
| -rw-r--r-- | Debian/Debhelper/Buildsystem/qmake_qt4.pm | 14 | ||||
| -rw-r--r-- | Debian/Debhelper/Dh_Buildsystems.pm | 1 | ||||
| -rw-r--r-- | debian/changelog | 2 |
4 files changed, 20 insertions, 1 deletions
diff --git a/Debian/Debhelper/Buildsystem/qmake.pm b/Debian/Debhelper/Buildsystem/qmake.pm index 4e67f918..521013b3 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 00000000..1bc9fe6f --- /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 9c3fc059..405b79c6 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; diff --git a/debian/changelog b/debian/changelog index 71fd85e9..c8880217 100644 --- 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 |