Changeset 93 for trunk/src

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/src/qt.pro (modified) (1 diff)

trunk/src/qt.pro

@@ -178 +178 @@
 shared:os2:qt_official_build {
         TARGET = qt$$split(VERSION,.,)
-        system( echo QMAKE_QT_DLL_TARGET = $$TARGET > ..\.build )
+        system( echo QMAKE_QT_DLL_TARGET = $$TARGET > ..\.qtbuild )
 } else {
         TARGET = $$QMAKE_QT_DLL_TARGET