Changeset 1684

Timestamp:

07/15/08 04:26:07 (7 weeks ago)

Author:

bird

Message:

qt3 unit: initial coding. (todo: testing + QT_IMAGES)

Files:

• trunk/kBuild/units/qt3.kmk (copied) (copied from trunk/kBuild/units/qt4.kmk) (39 diffs)

trunk/kBuild/units/qt3.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Qt 4 unit.
+# Qt 3 unit.
 #
 
@@ -25 +25 @@
 #
 
-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
-
-
-#
-# The QT4 SDK.
+ifdef UNIT_qt3
+ $(error kBuild: The qt3 unit was included twice!)
+endif
+UNIT_qt3 = qt3
+
+
+ifndef UNIT_qt4
+ # Add our target properties (same as qt4).
+ 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 +=
+PROPS_ACCUMULATE_R +=
+
+
+#
+# The QT3 SDK.
 #
 # This is implemented here rather than in sdks/QT4.kmk to enforce the global USES.
@@ -40 +48 @@
 ## @todo the SDK might actually not be necessary as it turns out... For now it servers
 # a purpose if the host differs from the target, in theory at least.
-SDK_QT4 = Qt4
+SDK_QT3 = Qt3
 
 # SDK Specific Properties
-ifndef PATH_SDK_QT4
- PATH_SDK_QT4 := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
- ifeq ($(PATH_SDK_QT4),)
+ifndef PATH_SDK_QT3
+ PATH_SDK_QT3 := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v3*)))
+ ifeq ($(PATH_SDK_QT3),)
   # If target == host, try look for Qt in the various platform specific places.
   ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
    ifeq ($(KBUILD_TARGET),darwin)
-    PATH_SDK_QT4 := $(patsubst %/Frameworks/QtCore.framework/Versions/4,%,$(firstword $(wildcard /Library/Frameworks/QtCore.framework/Versions/4)))
+    # No idea here yet...
+   else ifeq ($(KBUILD_TARGET),os2)
+    # No idea here yet...
    else ifeq ($(KBUILD_TARGET),win)
     # No idea here yet...
    else
-    # The Unices. Includes and esp. libs are tricky, so override the PATH_SDK_QT4_LIB* stuff if it doesn't work.
-    PATH_SDK_QT4 := $(patsubst %/bin/qt3to4,%,$(firstword $(wildcard /usr/bin/qt3to4 /usr/local/bin/qt3to4 /usr/qt/4/bin/qt3to4)))
-    ifneq ($(PATH_SDK_QT4),)
-     ifeq ($(PATH_SDK_QT4_INC),)
-      PATH_SDK_QT4_INC := $(patsubst %/QtCore/qglobal.h,%,$(firstword $(wildcard $(PATH_SDK_QT4)/include/QtCore/qglobal.h $(PATH_SDK_QT4)/include/qt4/QtCore/qglobal.h)))
+    # The Unices. Includes and esp. libs are tricky, so override the PATH_SDK_QT3_LIB* stuff if it doesn't work.
+    PATH_SDK_QT3 := $(patsubst %/bin/qm2ts,%,$(firstword $(wildcard /usr/bin/qm2ts /usr/local/bin/qm2ts /usr/qt/3/bin/qm2ts)))
+    ifneq ($(PATH_SDK_QT3),)
+     ifeq ($(PATH_SDK_QT3_INC),)
+      PATH_SDK_QT3_INC := $(patsubst %/private/qfiledefs_p.h,%,$(firstword $(wildcard $(PATH_SDK_QT3)/include/private/qfiledefs_p.h $(PATH_SDK_QT3)/include/qt3/private/qfiledefs_p.h)))
      endif
-     ifeq ($(PATH_SDK_QT4_LIB.x86),)
-      PATH_SDK_QT4_LIB.x86   := $(patsubst %/libQtCore$(SUFF_DLL),%,$(firstword $(wildcard \
-        $(PATH_SDK_QT4)/lib32/libQtCore$(SUFF_DLL) \
-        $(PATH_SDK_QT4)/lib32/qt4/libQtCore$(SUFF_DLL) \
-        $(PATH_SDK_QT4)/lib/libQtCore$(SUFF_DLL) \
-        $(PATH_SDK_QT4)/lib/qt4/libQtCore$(SUFF_DLL) \
+     ifeq ($(PATH_SDK_QT3_LIB.x86),)
+      PATH_SDK_QT3_LIB.x86   := $(patsubst %/libqt-mt$(SUFF_DLL),%,$(firstword $(wildcard \
+        $(PATH_SDK_QT3)/lib32/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib32/qt3/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib/qt3/libqt-mt$(SUFF_DLL) \
         )))
      endif
-     ifeq ($(PATH_SDK_QT4_LIB.amd64),)
-      PATH_SDK_QT4_LIB.amd64 := $(patsubst %/libQtCore$(SUFF_DLL),%,$(firstword $(wildcard \
-        $(PATH_SDK_QT4)/lib64/libQtCore$(SUFF_DLL) \
-        $(PATH_SDK_QT4)/lib64/qt4/libQtCore$(SUFF_DLL) \
-        $(PATH_SDK_QT4)/lib/amd64/libQtCore$(SUFF_DLL) \
-        $(PATH_SDK_QT4)/lib/libQtCore$(SUFF_DLL) \
-        $(PATH_SDK_QT4)/lib/qt4/libQtCore$(SUFF_DLL) \
+     ifeq ($(PATH_SDK_QT3_LIB.amd64),)
+      PATH_SDK_QT3_LIB.amd64 := $(patsubst %/libqt-mt$(SUFF_DLL),%,$(firstword $(wildcard \
+        $(PATH_SDK_QT3)/lib64/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib64/qt3/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib/amd64/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib/qt3/libqt-mt$(SUFF_DLL) \
         )))
      endif
-     ifeq ($(PATH_SDK_QT4_LIB),)
-      PATH_SDK_QT4_LIB := $(PATH_SDK_QT4_LIB.$(KBUILD_TARGET))
-      ifeq ($(PATH_SDK_QT4_LIB),)
-       PATH_SDK_QT4_LIB := $(patsubst %/libQtCore$(SUFF_DLL),%,$(firstword $(wildcard \
-        $(PATH_SDK_QT4)/lib/libQtCore$(SUFF_DLL) \
-        $(PATH_SDK_QT4)/lib/qt4/libQtCore$(SUFF_DLL) \
+     ifeq ($(PATH_SDK_QT3_LIB),)
+      PATH_SDK_QT3_LIB := $(PATH_SDK_QT3_LIB.$(KBUILD_TARGET))
+      ifeq ($(PATH_SDK_QT3_LIB),)
+       PATH_SDK_QT3_LIB := $(patsubst %/libqt-mt$(SUFF_DLL),%,$(firstword $(wildcard \
+        $(PATH_SDK_QT3)/lib/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib/qt3/libqt-mt$(SUFF_DLL) \
         )))
       endif
@@ -89 +99 @@
   endif
   # Found it?
-  ifeq ($(PATH_SDK_QT4),)
+  ifeq ($(PATH_SDK_QT3),)
    $(warning kBuild: Couldn't find the Qt4 headers and libaries...)
-   PATH_SDK_QT4 := $(PATH_DEVTOOLS_TRG)/qt/not-found
+   PATH_SDK_QT3 := $(PATH_DEVTOOLS_TRG)/qt/not-found
   endif
  endif
 else
  # Resolve any fancy stuff once and for all.
- PATH_SDK_QT4 := $(PATH_SDK_QT4)
+ PATH_SDK_QT3 := $(PATH_SDK_QT3)
 endif
 
 # Libraries can be in either Frameworks or lib depending on how you
 # build it on the mac. The .dmg installs into Frameworks but builds into lib.
-ifeq ($(KBUILD_TARGET),darwin)
- ifndef PATH_SDK_QT4_LIB
-  ifneq ($(wildcard $(PATH_SDK_QT4)/Frameworks),)
-   PATH_SDK_QT4_LIB ?= $(PATH_SDK_QT4)/Frameworks
-  else
-   PATH_SDK_QT4_LIB ?= $(PATH_SDK_QT4)/lib
-  endif
- endif
-else
- PATH_SDK_QT4_LIB ?= $(PATH_SDK_QT4)/lib
- PATH_SDK_QT4_INC ?= $(PATH_SDK_QT4)/include
-endif
+PATH_SDK_QT3_LIB ?= $(PATH_SDK_QT3)/lib
+PATH_SDK_QT3_INC ?= $(PATH_SDK_QT3)/include
 
 # The bits that kBuild picks up.
@@ -119 +119 @@
 
 #
-# The QT4 tool.
-#
-# This is implemented here rather than in tools/QT4.kmk to enforce the global USES.
+# The QT3 tool.
+#
+# This is implemented here rather than in tools/QT3.kmk to enforce the global USES.
 # It also makes things easier to develop, with fewer files I mean.
 #
-TOOL_QT4 = Qt4
+TOOL_QT3 = Qt3
 
 # Tool Specific Properties
-ifndef PATH_TOOL_QT4
- PATH_TOOL_QT4 := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_BLD)/qt/v4*)))
+ifndef PATH_TOOL_QT3
+ PATH_TOOL_QT3 := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_BLD)/qt/v3*)))
+ ifeq ($(PATH_TOOL_QT3),)
+  PATH_TOOL_QT3 := $(patsubst %/bin/qm2ts,%,$(firstword $(wildcard /usr/bin/qm2ts /usr/local/bin/qm2ts /usr/qt/3/bin/qm2ts)))
+ endif
  # If not found, we'll enter the 'pathless' mode.
 else
  # Resolve any fancy stuff once and for all.
- PATH_TOOL_QT4 := $(PATH_TOOL_QT4)
-endif
-ifneq ($(PATH_TOOL_QT4),)
- PATH_TOOL_QT4_BIN  ?= $(PATH_TOOL_QT4)/bin
- TOOL_QT4_MOC       ?= $(PATH_TOOL_QT4_BIN)/moc$(HOST_SUFF_EXE)
- TOOL_QT4_UIC       ?= $(PATH_TOOL_QT4_BIN)/uic$(HOST_SUFF_EXE)
- TOOL_QT4_RCC       ?= $(PATH_TOOL_QT4_BIN)/rcc$(HOST_SUFF_EXE)
- TOOL_QT4_LRC       ?= $(PATH_TOOL_QT4_BIN)/lrelease$(HOST_SUFF_EXE)
- TOOL_QT4_LUPDATE   ?= $(PATH_TOOL_QT4_BIN)/lupdate$(HOST_SUFF_EXE)
+ PATH_TOOL_QT3 := $(PATH_TOOL_QT3)
+endif
+ifneq ($(PATH_TOOL_QT3),)
+ PATH_TOOL_QT3_BIN  ?= $(PATH_TOOL_QT3)/bin
+ TOOL_QT3_MOC       ?= $(PATH_TOOL_QT3_BIN)/moc$(HOST_SUFF_EXE)
+ TOOL_QT3_UIC       ?= $(PATH_TOOL_QT3_BIN)/uic$(HOST_SUFF_EXE)
+ TOOL_QT3_LRC       ?= $(PATH_TOOL_QT3_BIN)/lrelease$(HOST_SUFF_EXE)
+ TOOL_QT3_LUPDATE   ?= $(PATH_TOOL_QT3_BIN)/lupdate$(HOST_SUFF_EXE)
 else
  # Pathless, relies on the environment.
- TOOL_QT4_MOC       ?= moc$(HOST_SUFF_EXE)
- TOOL_QT4_UIC       ?= uic$(HOST_SUFF_EXE)
- TOOL_QT4_RCC       ?= rcc$(HOST_SUFF_EXE)
- TOOL_QT4_LRC       ?= lrelease$(HOST_SUFF_EXE)
- TOOL_QT4_LUPDATE   ?= lupdate$(HOST_SUFF_EXE)
+ TOOL_QT3_MOC       ?= moc$(HOST_SUFF_EXE)
+ TOOL_QT3_UIC       ?= uic$(HOST_SUFF_EXE)
+ TOOL_QT3_LRC       ?= lrelease$(HOST_SUFF_EXE)
+ TOOL_QT3_LUPDATE   ?= lupdate$(HOST_SUFF_EXE)
 endif
 
 # General Properties used by kBuild and/or units/qt.kmk
-TOOL_QT4_MOCFLAGS           ?=
-TOOL_QT4_MOCINCS            ?=
-TOOL_QT4_MOCDEFS            ?=
-TOOL_QT4_MOCDEFS.darwin     ?= __APPLE__ __GNUC__
-TOOL_QT4_MOCDEFS.solaris    ?= __sun
-TOOL_QT4_MOCDEFS.win.amd64  ?= WIN64
-TOOL_QT4_MOCDEFS.win.x86    ?= WIN32
+TOOL_QT3_MOCFLAGS   ?=
+TOOL_QT3_UICFLAGS   ?=
+TOOL_QT3_LRCFLAGS   ?=
 
 
@@ -166 +163 @@
 # @param    $(dep)      Dependcy file. This may be (re)created by the compilation.
 # @param    $(flags)    Flags.
-# @param    $(defs)     Definitions.
-# @param    $(incs)     Includes.
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 #
-TOOL_QT4_MOC_CPP_DEPEND =
-TOOL_QT4_MOC_CPP_DEPORD =
-TOOL_QT4_MOC_CPP_OUTPUT =
-TOOL_QT4_MOC_CPP_OUTPUT_MAYBE =
-define TOOL_QT4_MOC_CPP_CMDS
-        $(QUIET)$(TOOL_QT4_MOC)\
+TOOL_QT3_MOC_CPP_DEPEND =
+TOOL_QT3_MOC_CPP_DEPORD =
+TOOL_QT3_MOC_CPP_OUTPUT =
+TOOL_QT3_MOC_CPP_OUTPUT_MAYBE =
+define TOOL_QT3_MOC_CPP_CMDS
+        $(QUIET)$(TOOL_QT3_MOC)\
                 $(flags)\
-                $(addprefix -I, $(incs))\
-                $(addprefix -D, $(defs))\
                 -o $(out)\
+                -i \
                 $(source)
 endef
@@ -189 +183 @@
 # @param    $(dep)      Dependcy file. This may be (re)created by the compilation.
 # @param    $(flags)    Flags.
-# @param    $(defs)     Definitions.
-# @param    $(incs)     Includes.
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 #
-TOOL_QT4_MOC_HPP_DEPEND =
-TOOL_QT4_MOC_HPP_DEPORD =
-TOOL_QT4_MOC_HPP_OUTPUT =
-TOOL_QT4_MOC_HPP_OUTPUT_MAYBE =
-define TOOL_QT4_MOC_HPP_CMDS
-        $(QUIET)$(TOOL_QT4_MOC)\
-                $(flags)\
-                $(addprefix -I, $(incs))\
-                $(addprefix -D, $(defs))\
-                -o $(out)\
-                $(source)
-endef
-
-## Compile a Qt user interface file (.ui).
-# @param    $(target)   Normalized main target name.
-# @param    $(source)   Source filename (relative).
-# @param    $(out)      Object file name. This shall be (re)created by the compilation.
-# @param    $(dep)      Dependcy file. This may be (re)created by the compilation.
-# @param    $(flags)    Flags.
-# @param    $(defs)     Definitions.
-# @param    $(incs)     Includes.
-# @param    $(outbase)  Output basename (full). Use this for list files and such.
-#
-TOOL_QT4_UIC_UI_DEPEND =
-TOOL_QT4_UIC_UI_DEPORD =
-TOOL_QT4_UIC_UI_OUTPUT =
-TOOL_QT4_UIC_UI_OUTPUT_MAYBE =
-define TOOL_QT4_UIC_UI_CMDS
-        $(QUIET)$(TOOL_QT4_UIC)\
+TOOL_QT3_MOC_HPP_DEPEND =
+TOOL_QT3_MOC_HPP_DEPORD =
+TOOL_QT3_MOC_HPP_OUTPUT =
+TOOL_QT3_MOC_HPP_OUTPUT_MAYBE =
+define TOOL_QT3_MOC_HPP_CMDS
+        $(QUIET)$(TOOL_QT3_MOC)\
                 $(flags)\
                 -o $(out)\
@@ -227 +196 @@
 endef
 
-## Compile a Qt resource file (.qrc).
+## Compile a Qt user interface file (.ui).
 # @param    $(target)   Normalized main target name.
 # @param    $(source)   Source filename (relative).
-# @param    $(out)      Object file name. This shall be (re)created by the compilation.
+# @param    $(out.cpp)  The C++ source file to be generated.
+# @param    $(out.h)    The C++ header file to be generated.
 # @param    $(dep)      Dependcy file. This may be (re)created by the compilation.
 # @param    $(flags)    Flags.
-# @param    $(defs)     Definitions.
-# @param    $(incs)     Includes.
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 #
-# @remarks  The sed script generating the dependency file is a bit naive.
-TOOL_QT4_RCC_QRC_DEPEND =
-TOOL_QT4_RCC_QRC_DEPORD =
-TOOL_QT4_RCC_QRC_OUTPUT =
-TOOL_QT4_RCC_QRC_OUTPUT_MAYBE =
-define TOOL_QT4_RCC_QRC_CMDS
-        $(QUIET)$(TOOL_QT4_RCC)\
+TOOL_QT3_UIC_UI_DEPEND =
+TOOL_QT3_UIC_UI_DEPORD =
+TOOL_QT3_UIC_UI_OUTPUT =
+TOOL_QT3_UIC_UI_OUTPUT_MAYBE =
+define TOOL_QT3_UIC_UI_CMDS
+        $(QUIET)$(TOOL_QT3_UIC)\
                 $(flags)\
-                -o $(out)\
+                -o $(out.h)\
                 $(source)
-        $(APPEND) $(dep) '$(source): \'
-        $(SED) \
-                -e '/^[[:blank:]]*<file[[:blank:]][^>]*>/!d' \
-                -e 's/^.*<file[[:blank:]][^>]*>\([^<]*\)<\/file>.*$$$$/\1/' \
-                -e 's|^[^/]|$(abspathex $(dir $(source)),$(defpath))/&|' \
-                -e 's|$$$$| \\|' \
-                --append $(dep) \
+        $(QUIET)$(TOOL_QT3_UIC)\
+                $(flags)\
+                -i $(out.h) \
+                -o $(out.cpp)\
                 $(source)
-        $(APPEND) $(dep)
-        $(SED) \
-                -e '/^[[:blank:]]*<file[[:blank:]][^>]*>/!d' \
-                -e 's/^.*<file[[:blank:]][^>]*>\([^<]*\)<\/file>.*$$$$/\1/' \
-                -e 's|^[^/]|$(abspathex $(dir $(source)),$(defpath))/&|' \
-                -e 's|$$$$|:\n|' \
-                --append $(dep) \
-                $(source)
-        $(APPEND) $(dep)
 endef
 
@@ -276 +231 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 #
-TOOL_QT4_LRC_TS_DEPEND =
-TOOL_QT4_LRC_TS_DEPORD =
-TOOL_QT4_LRC_TS_OUTPUT =
-TOOL_QT4_LRC_TS_OUTPUT_MAYBE =
-define TOOL_QT4_LRC_TS_CMDS
-        $(QUIET)$(TOOL_QT4_LRC)\
+TOOL_QT3_LRC_TS_DEPEND =
+TOOL_QT3_LRC_TS_DEPORD =
+TOOL_QT3_LRC_TS_OUTPUT =
+TOOL_QT3_LRC_TS_OUTPUT_MAYBE =
+define TOOL_QT3_LRC_TS_CMDS
+        $(QUIET)$(TOOL_QT3_LRC)\
                 $(flags)\
                 $(source)\
@@ -298 +253 @@
 ## wrapper for the lrelease (LRC) command dependencies.
 ifndef NO_COMPILE_CMDS_DEPS
- _UNIT_QT_LRC_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT_LRC_CMDS_PREV_),$$(commands $(out)),FORCE)
-else
- _UNIT_QT_LRC_CMDS_DEP =
-endif
-
-##
-# def_unit_qt4_target_pre_handle_translation helper that is expanded before evaluation.
+ _UNIT_QT3_LRC_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT3_LRC_CMDS_PREV_),$$(commands $(out)),FORCE)
+else
+ _UNIT_QT3_LRC_CMDS_DEP =
+endif
+
+##
+# def_unit_qt3_target_pre_handle_translation helper that is expanded before evaluation.
 #
 # This is necessary to resolve reference to local variables before doing
@@ -310 +265 @@
 # later in a different context and the result would be completely wrong.
 #
-define def_unit_qt4_target_pre_handle_translation_dx
+define def_unit_qt3_target_pre_handle_translation_dx
 
 $(out) + $(more_output) +| $(maybe_output): \
                 $(deps) \
-                $(value _UNIT_QT_LRC_CMDS_DEP) \
+                $(value _UNIT_QT3_LRC_CMDS_DEP) \
                 | \
                 $(orderdeps)
@@ -324 +279 @@
 ifndef NO_COMPILE_CMDS_DEPS
         %$$(QUIET2)$$(APPEND) '$(dep)'
-        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT_LRC_CMDS_PREV_'
+        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT3_LRC_CMDS_PREV_'
         %$$(QUIET2)$$(APPEND) -c '$(dep)' '$(out)'
         %$$(QUIET2)$$(APPEND) '$(dep)' 'endef'
@@ -332 +287 @@
 $(target)-inst-nls_SOURCES += $(out)
 
-endef # def_unit_qt4_target_pre_handle_translation_dx
+endef # def_unit_qt3_target_pre_handle_translation_dx
 
 ##
@@ -341 +296 @@
 #
 # @remarks Invoked via $(evalvalctx ).
-define def_unit_qt4_target_pre_handle_translation
+define def_unit_qt3_target_pre_handle_translation
 local type      := LRC
 
@@ -376 +331 @@
  $(eval includedep $(dep))
 endif
-$(eval $(def_unit_qt4_target_pre_handle_translation_dx))
-
-endef # def_unit_qt4_target_pre_handle_translation
+$(eval $(def_unit_qt3_target_pre_handle_translation_dx))
+
+endef # def_unit_qt3_target_pre_handle_translation
 
 
@@ -384 +339 @@
 ## wrapper for the UIC command dependencies.
 ifndef NO_COMPILE_CMDS_DEPS
- _UNIT_QT_RCC_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT_RCC_CMDS_PREV_),$$(commands $(out)),FORCE)
-else
- _UNIT_QT_RCC_CMDS_DEP =
-endif
-
-##
-# def_unit_qt4_target_pre_handle_qrc helper that is expanded before evaluation.
+ _UNIT_QT3_UIC_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT3_UIC_CMDS_PREV_),$$(commands $(out.h)),FORCE)
+else
+ _UNIT_QT3_UIC_CMDS_DEP =
+endif
+
+##
+# def_unit_qt3_src_handler_ui helper that is expanded before evaluation.
 #
 # This is necessary to resolve reference to local variables before doing
@@ -396 +351 @@
 # later in a different context and the result would be completely wrong.
 #
-define def_unit_qt4_target_pre_handle_rcc_dx
-
-$(out) +| $(realout) $(more_output) $(maybe_output): \
+define def_unit_qt3_target_pre_handle_ui_dx
+
+$(out.h) + $(out.cpp) +| $(realout.h) $(realout.cpp) $(more_output) $(maybe_output): \
                 $(deps) \
-                $(value _UNIT_QT_RCC_CMDS_DEP) \
+                $(value _UNIT_QT3_UIC_CMDS_DEP) \
                 | \
                 $(orderdeps)
-        %$$(call MSG_TOOL,rcc,$(target),$(source),$$@)
-        $(QUIET2)$(RM) -f $(out) $(more_output) $(maybe_output) $(dep)
+        %$$(call MSG_TOOL,uic,$(target),$(source),$(out.h) $(out.cpp))
+        $(QUIET2)$(RM) -f $(out.h) $(out.cpp) $(more_output) $(maybe_output) $(dep)
 
 $(cmds)
 
-        $(QUIET)$(CP) --changed -f $(out) $(realout)
+        $(QUIET)$(CP) --changed -f $(out.h) $(realout.h)
+        $(QUIET)$(CP) --changed -f $(out.cpp) $(realout.cpp)
 ifndef NO_COMPILE_CMDS_DEPS
         %$$(QUIET2)$$(APPEND) '$(dep)'
-        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT_RCC_CMDS_PREV_'
-        %$$(QUIET2)$$(APPEND) -c '$(dep)' '$(out)'
+        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT3_UIC_CMDS_PREV_'
+        %$$(QUIET2)$$(APPEND) -c '$(dep)' '$(out.h)'
         %$$(QUIET2)$$(APPEND) '$(dep)' 'endef'
 endif
 
-$(target)_INTERMEDIATES += $(realout)
-$(target)_GEN_SOURCES_ += $(realout)
-$(target)_OUT_FILES += $(out) $(realout) $(more_output) $(maybe_output)
-
-endef # def_unit_qt4_target_pre_handle_rcc_dx
-
-##
-# Source handler for .qrc sources (Qt resource files).
+$(target)_INTERMEDIATES += $(realout.h)
+$(target)_GEN_SOURCES_ += $(realout.cpp)
+$(target)_OUT_FILES += $(out.h) $(out.cpp) $(realout.h) $(realout.cpp) $(more_output) $(maybe_output)
+
+endef # def_unit_qt3_target_pre_handle_ui_dx
+
+##
+# Source handler for .ui sources.
 #
 # @remarks $(evalvalctx me).
-define def_unit_qt4_src_handler_qrc
-local type      := RCC
-
-# fetch the properties.
-local tool      := $(kb-src-tool dummy_var)
-local qtrccdir  := $(PATH_$(target))/qtrcc
-local outbase   := $(qtrccdir)/$(notdir $(basename $(source)))
-local out       := $(outbase).tmp.gen.cpp
-local realout   := $(outbase).gen.cpp
-local dep       := $(realout).dep
-local flags     := $(kb-src-prop FLAGS,dummy_var,right-to-left)
-local deps      := $(kb-src-prop DEPS,dummy_var,left-to-right)
-local orderdeps := $(call DIRDEP,$(dir $(outbase))) $(kb-src-prop ORDERDEPS,dummy_var,left-to-right)
-
-# default path + source dep.
-ifneq ($(defpath),)
-local deps      := $(abspathex $(deps) $(source),$($(target)_PATH))
-local incs      := $(abspathex $(incs),$($(target)_PATH))
-else
-local deps      += $(source)
-endif
-
-# call the tool
-ifndef TOOL_$(tool)_RCC_QRC_CMDS
- $(error kBuild: qt rcc tool not found: TOOL_$(tool)_RCC_QRC_CMDS)
-endif
-local cmds         := $(TOOL_$(tool)_RCC_QRC_CMDS)
-local more_output  := $(TOOL_$(tool)_RCC_QRC_OUTPUT)
-local maybe_output := $(TOOL_$(tool)_RCC_QRC_OUTPUT_MAYBE)
-local deps         += $(TOOL_$(tool)_RCC_QRC_DEPEND)
-local orderdeps    += $(TOOL_$(tool)_RCC_QRC_DEPORD)
-
-# generate the link rule and update some source and target variables.
-ifndef NO_COMPILE_CMDS_DEPS
- $(eval includedep $(dep))
-endif
-$(eval $(def_unit_qt4_target_pre_handle_rcc_dx))
-
-endef # def_unit_qt4_src_handler_qrc
-
-
-
-## wrapper for the UIC command dependencies.
-ifndef NO_COMPILE_CMDS_DEPS
- _UNIT_QT_UIC_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT_UIC_CMDS_PREV_),$$(commands $(out)),FORCE)
-else
- _UNIT_QT_UIC_CMDS_DEP =
-endif
-
-##
-# def_unit_qt4_src_handler_ui helper that is expanded before evaluation.
-#
-# This is necessary to resolve reference to local variables before doing
-# assignments and setting up commands. They would otherwise be resolved
-# later in a different context and the result would be completely wrong.
-#
-define def_unit_qt4_target_pre_handle_ui_dx
-
-$(out) +| $(realout) $(more_output) $(maybe_output): \
-                $(deps) \
-                $(value _UNIT_QT_UIC_CMDS_DEP) \
-                | \
-                $(orderdeps)
-        %$$(call MSG_TOOL,uic,$(target),$(source),$$@)
-        $(QUIET2)$(RM) -f $(out) $(more_output) $(maybe_output) $(dep)
-
-$(cmds)
-
-        $(QUIET)$(CP) --changed -f $(out) $(realout)
-ifndef NO_COMPILE_CMDS_DEPS
-        %$$(QUIET2)$$(APPEND) '$(dep)'
-        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT_UIC_CMDS_PREV_'
-        %$$(QUIET2)$$(APPEND) -c '$(dep)' '$(out)'
-        %$$(QUIET2)$$(APPEND) '$(dep)' 'endef'
-endif
-
-$(target)_INTERMEDIATES += $(realout)
-$(target)_OUT_FILES += $(out) $(realout) $(more_output) $(maybe_output)
-
-endef # def_unit_qt4_target_pre_handle_ui_dx
-
-##
-# Source handler for .ui sources.
-#
-# @remarks $(evalvalctx me).
-define def_unit_qt4_src_handler_ui
+define def_unit_qt3_src_handler_ui
 local type      := UIC
 
@@ -518 +389 @@
 local qtuicdir  := $(PATH_$(target))/qtuic
 local outbase   := $(qtuicdir)/$(notdir $(basename $(source)))
-local out       := $(outbase).tmp.gen.h
-local realout   := $(outbase).gen.h
-local dep       := $(realout).dep
+local out.h     := $(outbase).tmp.h
+local out.cpp   := $(outbase).tmp.cpp
+local realout.h := $(outbase).h
+local realout.cpp:=$(outbase).cpp
+local dep       := $(realout.h).dep
 local flags     := $(kb-src-prop FLAGS,dummy_var,right-to-left)
 local deps      := $(kb-src-prop DEPS,dummy_var,left-to-right)
@@ -547 +420 @@
  $(eval includedep $(dep))
 endif
-$(eval $(def_unit_qt4_target_pre_handle_ui_dx))
-
-endef # def_unit_qt4_src_handler_ui
+$(eval $(def_unit_qt3_target_pre_handle_ui_dx))
+
+endef # def_unit_qt3_src_handler_ui
 
 
@@ -555 +428 @@
 ## wrapper for the MOC command dependencies.
 ifndef NO_COMPILE_CMDS_DEPS
- _UNIT_QT_MOC_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT_MOC_CMDS_PREV_),$$(commands $(out)),FORCE)
-else
- _UNIT_QT_MOC_CMDS_DEP =
-endif
-
-##
-# def_unit_qt4_target_pre_handle_moc_hdr helper that is expanded before evaluation.
+ _UNIT_QT3_MOC_HPP_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT3_MOC_HPP_CMDS_PREV_),$$(commands $(out)),FORCE)
+else
+ _UNIT_QT3_MOC_HPP_CMDS_DEP =
+endif
+
+##
+# def_unit_qt3_target_pre_handle_moc_hdr helper that is expanded before evaluation.
 #
 # This is necessary to resolve reference to local variables before doing
@@ -567 +440 @@
 # later in a different context and the result would be completely wrong.
 #
-define def_unit_qt4_target_pre_handle_moc_hdr_dx
+define def_unit_qt3_target_pre_handle_moc_hdr_dx
 
 $(out) +| $(realout) $(more_output) $(maybe_output): \
                 $(deps) \
-                $(value _UNIT_QT_MOC_CMDS_DEP) \
+                $(value _UNIT_QT3_MOC_HPP_CMDS_DEP) \
                 | \
                 $(orderdeps)
-        %$$(call MSG_TOOL,moc,$(target),$(source),$$@)
+        %$$(call MSG_TOOL,moc,$(target),$(source),$(realout))
         $(QUIET2)$(RM) -f $(out) $(more_output) $(maybe_output) $(dep)
 
@@ -582 +455 @@
 ifndef NO_COMPILE_CMDS_DEPS
         %$$(QUIET2)$$(APPEND) '$(dep)'
-        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT_MOC_CMDS_PREV_'
+        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT3_MOC_HPP_CMDS_PREV_'
         %$$(QUIET2)$$(APPEND) -c '$(dep)' '$(out)'
         %$$(QUIET2)$$(APPEND) '$(dep)' 'endef'
@@ -594 +467 @@
 
 ##
-# Handle a source file listed in QT_MOCHDRSS.
+# Handle a source file listed in QT_MOCHDRS.
 #
 # The files listed in QT_MOCHDRS uses the Q_OBJECT macro and we will
@@ -603 +476 @@
 #
 # @remarks Invoked via $(evalvalctx ).
-define def_unit_qt4_target_pre_handle_moc_hdr
+define def_unit_qt3_target_pre_handle_moc_hdr
 local type      := MOC