Changeset 1682

Timestamp:

07/15/08 02:49:49 (8 weeks ago)

Author:

bird

Message:

qt4: Fixed QTTOOL.

Files:

• trunk/kBuild/units/qt4.kmk (modified) (2 diffs)

trunk/kBuild/units/qt4.kmk

@@ -25 +25 @@
 #
 
+ifdef UNIT_qt4
+ $(error kBuild: The qt4 unit was included twice!)
+endif
 UNIT_qt4 = qt4
 
-# Add our target properties.
-PROPS_SINGLE += QTTOOL MOCTOOL UICTOOL RCCTOOL LRCTOOL QT_TRANSLATIONS_INST QT_TRANSLATIONS_TEMPLATE QT_PREFIX
-PROPS_ACCUMULATE_R += MOCDEFS MOCFLAGS UICFLAGS RCCFLAGS LRCFLAGS QT_TRANSLATIONS QT_MOCSRCS QT_MOCHDRS QT_MODULES
+
+ifndef UNIT_qt3
+ # Add our target properties (same as qt3).
+ PROPS_SINGLE += QTTOOL MOCTOOL UICTOOL LRCTOOL QT_TRANSLATIONS_INST QT_TRANSLATIONS_TEMPLATE QT_PREFIX
+ PROPS_ACCUMULATE_R += MOCDEFS MOCFLAGS UICFLAGS LRCFLAGS QT_TRANSLATIONS QT_MOCSRCS QT_MOCHDRS
+endif
+PROPS_SINGLE += RCCTOOL
+PROPS_ACCUMULATE_R += RCCFLAGS QT_MODULES
 
 
@@ -750 +758 @@
 ifneq ($($(target)_QTTOOL),)
  ifeq ($($(target)_MOCTOOL),)
-  $($(target)_MOCTOOL := $($(target)_QTTOOL)
+  $(target)_MOCTOOL := $($(target)_QTTOOL)
  endif
  ifeq ($($(target)_UICTOOL),)
-  $($(target)_UICTOOL := $($(target)_QTTOOL)
+  $(target)_UICTOOL := $($(target)_QTTOOL)
  endif
  ifeq ($($(target)_RCCTOOL),)
-  $($(target)_RCCTOOL := $($(target)_QTTOOL)
+  $(target)_RCCTOOL := $($(target)_QTTOOL)
  endif
  ifeq ($($(target)_LRCTOOL),)
-  $($(target)_LRCTOOL := $($(target)_QTTOOL)
+  $(target)_LRCTOOL := $($(target)_QTTOOL)
  endif
 endif