Git commit 70e5f241e3c2e35507f4446f653e4c0c48c6c8a5 by Michael Pyne. Committed on 07/02/2015 at 22:31. Pushed by ashark into branch 'docbook_historied_per_file'.
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 Original commit: 432efae0 https://invent.kde.org/sdk/kdesrc-build/-/commit/432efae0a9841be849c78f9ef24ea48296f3c19c M +1 -1 doc/index.docbook M +14 -0 doc/kdesrc-buildrc/conf-options-table.docbook https://invent.kde.org/sdk/kdesrc-build/-/commit/70e5f241e3c2e35507f4446f653e4c0c48c6c8a5 diff --git a/doc/index.docbook b/doc/index.docbook index a1c4a828..2e9d84e3 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 <mp...@kde.org> + Copyright (c) 2005-2008, 2010-2015 Michael Pyne <mp...@kde.org> Copyright (c) 2005 Carlos Leonhard Woelz <carloswo...@imap-mail.com> Copyright (c) 2009 Burkhard Lück <lu...@hube-lueck.de> diff --git a/doc/kdesrc-buildrc/conf-options-table.docbook b/doc/kdesrc-buildrc/conf-options-table.docbook index 02f43429..4c1594fb 100644 --- a/doc/kdesrc-buildrc/conf-options-table.docbook +++ b/doc/kdesrc-buildrc/conf-options-table.docbook @@ -801,6 +801,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>