Added addMMPRules for adding conditional MMP_RULES

Usage:

    # Set conditional libraries
    LIB.MARM = "LIBRARY myarm.lib"
    LIB.WINSCW = "LIBRARY mywinscw.lib"
    LIB.default = "LIBRARY mydefault.lib"

    # Set conditional Epoc Heap Size
    EHZ.WINSCW = "EPOCHEAPSIZE 0x2000 0x2000000"
    EHZ.default = "EPOCHEAPSIZE 0x40000 0x400000"

    # Add the conditional MMP rules
    MYCONDITIONS = MARM WINSCW
    MYVARIABLES = LIB EHZ

    addMMPRules(MYCONDITIONS, MYVARIABLES)

This will generate the following in the mmp file:

    #if defined(MARM)

    LIBRARY myarm.lib

    EPOCHEAPSIZE 0x40000 0x400000

    #elif defined(WINSCW)

    LIBRARY mywinscw.lib

    EPOCHEAPSIZE 0x2000 0x2000000

    #else

    LIBRARY mydefault.lib

    EPOCHEAPSIZE 0x40000 0x400000

    #endif

Task-number: QT-2909
Reviewed-by: axis

2 files changed, 21 insertions, 1 deletions

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 78dfefa..b3d6f72 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1727,8 +1727,15 @@ distinction between shared and
     
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 139
 
+    There is also a convenience function for adding conditional rules
+    called \c{addMMPRules}. Suppose you need certain functionality
+    to require different library depending on architecture. This
+    can be specified with \c{addMMPRules} as follows:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 148
+
     \note You should not use this variable to add MMP statements that are
-    explicitly supported by their own variables, such as 
+    explicitly supported by their own variables, such as
     \c TARGET.EPOCSTACKSIZE. 
     Doing so could result in duplicate statements in the MMP file.
 
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
index a48b53f..5a04420 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -969,3 +969,16 @@ DEPLOYMENT.installer_header = 0x12345678
 //! [147]
 DEPLOYMENT.installer_header = "$${LITERAL_HASH}{\"My Application Installer\"},(0x12345678),1,0,0"
 //! [147]
+
+//! [148]
+# Set conditional libraries
+LIB.MARM = "LIBRARY myarm.lib"
+LIB.WINSCW = "LIBRARY mywinscw.lib"
+LIB.default = "LIBRARY mydefault.lib"
+
+# Add the conditional MMP rules
+MYCONDITIONS = MARM WINSCW
+MYVARIABLES = LIB
+
+addMMPRules(MYCONDITIONS, MYVARIABLES)
+//! [148]