[kde-doc-english] [kdesrc-build] /: qmake: Add qmake-options to pass options to qmake.

[Michael Pyne]

Git commit 432efae0a9841be849c78f9ef24ea48296f3c19c by Michael Pyne.
Committed on 07/02/2015 at 22:31.
Pushed by mpyne into branch 'master'.

qmake: Add qmake-options to pass options to qmake.

Obviously this only applies to the few modules that utilize the qmake
build system.

BUG:342416
FIXED-IN:1.16

M  +15   -1    doc/index.docbook
M  +2    -1    modules/ksb/BuildSystem/QMake.pm

http://commits.kde.org/kdesrc-build/432efae0a9841be849c78f9ef24ea48296f3c19c

diff --git a/doc/index.docbook b/doc/index.docbook
index 2395886..14a9677 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!--
     Documentation for kdesrc-build.
-    Copyright (c) 2005-2008, 2010-2014 Michael Pyne <mpyne at kde.org>
+    Copyright (c) 2005-2008, 2010-2015 Michael Pyne <mpyne at kde.org>
 
     Copyright (c) 2005 Carlos Leonhard Woelz <carloswoelz at imap-mail.com>
     Copyright (c) 2009 Burkhard Lück <lueck at hube-lueck.de>
@@ -2337,6 +2337,20 @@ deleted or not. The default value is <replaceable>true</replaceable>.</para>
 </entry>
 </row>
 
+<row id="conf-qmake-options">
+<entry>qmake-options</entry>
+<entry>Module setting overrides global</entry>
+
+<entry><para>Any options specified here are passed to the
+<command>qmake</command> command, for modules that use the
+<symbol>qmake</symbol> build system. For instance, you can use the
+<userinput>PREFIX=/path/to/qt</userinput> option to qmake to override where it
+installs the module.
+</para>
+<para>This option was added to &kdesrc-build; 1.16.</para>
+</entry>
+</row>
+
 <row id="conf-qtdir">
 <entry>qtdir</entry>
 <entry>Module setting overrides global</entry>
diff --git a/modules/ksb/BuildSystem/QMake.pm b/modules/ksb/BuildSystem/QMake.pm
index b4508db..5d28cea 100644
--- a/modules/ksb/BuildSystem/QMake.pm
+++ b/modules/ksb/BuildSystem/QMake.pm
@@ -44,6 +44,7 @@ sub configureInternal
     my $module = $self->module();
     my $builddir = $module->fullpath('build');
     my $sourcedir = $module->fullpath('source');
+    my @qmakeOpts = split(' ', $module->getOption('qmake-options'));
     my @projectFiles = glob("$sourcedir/*.pro");
 
     if (!@projectFiles || !$projectFiles[0]) {
@@ -59,7 +60,7 @@ sub configureInternal
 
     my $qmake = absPathToQMake();
     return 0 unless $qmake;
-    return log_command($module, 'qmake', [ $qmake, $projectFiles[0] ]) == 0;
+    return log_command($module, 'qmake', [ $qmake, @qmakeOpts, $projectFiles[0] ]) == 0;
 }
 
 1;