Changeset 93 for trunk/qmake/generators/os2/gnumake.cpp

Timestamp:

May 1, 2006, 11:16:33 PM (19 years ago)

Author:

dmik

Message:

GNUMAKE backend:

• Added the internal qmake variable QMAKE_DEFINES_QT (similar to DEFINES but effective only when qt, qtinc or build_qt is present in CONFIG).

Configure script:

• Mandatory Qt defines are moved from the .qtos2defines file to the generated .qtos2config file (this makes usage of QMAKE_DEFINES_QT).
• Added the ability to specify a list of custom Qt defines (also using QMAKE_DEFINES_QT).
• When a custom build is performed, the .qtbuild file is automatically deleted (if exists) to avoid confusion.
• no_mocdepend is always added to CONFIG in .qtos2config to prevent generated moc sources from being dependent on the moc executable (quite useless).

File:

• trunk/qmake/generators/os2/gnumake.cpp (modified) (1 diff)

trunk/qmake/generators/os2/gnumake.cpp

@@ -450 +450 @@
     if (project->isActiveConfig("qt") && project->isActiveConfig("shared"))
         project->variables()["DEFINES"].append("QT_DLL");
+
+    if (!project->variables()["QMAKE_DEFINES_QT"].isEmpty() &&
+        (is_qt || project->isActiveConfig("qt") || project->isActiveConfig("qtinc"))) {
+        QStringList &defs = project->variables()["DEFINES"];
+        QStringList &qtdefs = project->variables()["QMAKE_DEFINES_QT"];
+        QStringList::ConstIterator it = qtdefs.end();
+        while (it != qtdefs.begin()) {
+            --it;
+            if (!defs.contains(*it))
+                defs.prepend(*it);
+        }
+    }
     
     if (project->isActiveConfig("qt_dll"))