Changeset 93 for trunk/mkspecs

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/mkspecs/os2-g++/qmake.conf (modified) (2 diffs)

trunk/mkspecs/os2-g++/qmake.conf

@@ -16 +16 @@
 
 exists( $(QTDIR)\.qtos2config ) {
-        include( $(QTDIR)\.qtos2config )
+        include( $(QTDIR)\.qtos2config )
 }
-exists( $(QTDIR)\.build ) {
-        include( $(QTDIR)\.build )
+exists( $(QTDIR)\.qtbuild ) {
+        include( $(QTDIR)\.qtbuild )
 }
 
@@ -66 +66 @@
 QMAKE_LIBDIR_QT         = $(QTDIR)\lib
 QMAKE_LIBDIR_QT_DEBUG   = $(QTDIR)\lib\debug
+
+QMAKE_DEFINES_QT        +=
 
 # As a workaround for the CMD.EXE command line length limitation (1024 chars)