1 diff -urN VirtualBox-2.0.0.orig/Config.kmk VirtualBox-2.0.0/Config.kmk
2 --- VirtualBox-2.0.0.orig/Config.kmk 2008-09-03 20:16:30.000000000 +0200
3 +++ VirtualBox-2.0.0/Config.kmk 2008-09-04 20:06:51.000000000 +0200
4 @@ -1694,10 +1694,10 @@
6 VBOX_PATH_QT_HOST ?= $(QTDIR)
8 -VBOX_UIC ?= $(VBOX_PATH_QT_HOST)/bin/uic$(HOSTSUFF_EXE)
9 -VBOX_MOC ?= $(VBOX_PATH_QT_HOST)/bin/moc$(HOSTSUFF_EXE)
10 -VBOX_LUPDATE ?= $(VBOX_PATH_QT_HOST)/bin/lupdate$(HOSTSUFF_EXE)
11 -VBOX_LRELEASE ?= $(VBOX_PATH_QT_HOST)/bin/lrelease$(HOSTSUFF_EXE)
12 +VBOX_UIC ?= /usr/bin/uic-qt4$(HOSTSUFF_EXE)
13 +VBOX_MOC ?= /usr/bin/moc-qt4$(HOSTSUFF_EXE)
14 +VBOX_LUPDATE ?= /usr/bin/lupdate-qt4$(HOSTSUFF_EXE)
15 +VBOX_LRELEASE ?= /usr/bin/lrelease-qt4$(HOSTSUFF_EXE)
17 ifeq ($(KBUILD_TARGET),os2)
18 # search DLLs in the EXE directory first (unless VBOX_DLL_QT is set)
20 TEMPLATE_VBOXQTGUIEXE = VBox Qt GUI Executable
21 TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS)
22 TEMPLATE_VBOXQTGUIEXE_INCS = \
23 - $(VBOX_PATH_QT)/include
26 ifeq ($(KBUILD_TARGET),win)
27 # drag in library configuration (we need QMAKE_PRL_DEFINES)
28 @@ -2750,10 +2750,10 @@
30 ifeq ($(KBUILD_TARGET_ARCH),amd64)
31 TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
32 - $(VBOX_PATH_QT)/lib64 $(VBOX_PATH_QT)/lib
35 TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
40 ifeq ($(KBUILD_TARGET),linux)
41 --- VirtualBox-2.0.0.orig/kBuild/units/qt4.kmk 2008-08-26 20:42:40.000000000 +0200
42 +++ VirtualBox-2.0.0/kBuild/units/qt4.kmk 2008-09-04 21:54:57.450546565 +0200
45 ifneq ($(PATH_TOOL_QT4),)
46 PATH_TOOL_QT4_BIN ?= $(PATH_TOOL_QT4)/bin
47 - TOOL_QT4_MOC ?= $(PATH_TOOL_QT4_BIN)/moc$(HOST_SUFF_EXE)
48 - TOOL_QT4_UIC ?= $(PATH_TOOL_QT4_BIN)/uic$(HOST_SUFF_EXE)
49 - TOOL_QT4_RCC ?= $(PATH_TOOL_QT4_BIN)/rcc$(HOST_SUFF_EXE)
50 - TOOL_QT4_LRC ?= $(PATH_TOOL_QT4_BIN)/lrelease$(HOST_SUFF_EXE)
51 - TOOL_QT4_LUPDATE ?= $(PATH_TOOL_QT4_BIN)/lupdate$(HOST_SUFF_EXE)
52 + TOOL_QT4_MOC ?= $(PATH_TOOL_QT4_BIN)/moc-qt4$(HOST_SUFF_EXE)
53 + TOOL_QT4_UIC ?= $(PATH_TOOL_QT4_BIN)/uic-qt4$(HOST_SUFF_EXE)
54 + TOOL_QT4_RCC ?= $(PATH_TOOL_QT4_BIN)/rcc-qt4$(HOST_SUFF_EXE)
55 + TOOL_QT4_LRC ?= $(PATH_TOOL_QT4_BIN)/lrelease-qt4$(HOST_SUFF_EXE)
56 + TOOL_QT4_LUPDATE ?= $(PATH_TOOL_QT4_BIN)/lupdate-qt4$(HOST_SUFF_EXE)
58 # Pathless, relies on the environment.
59 - TOOL_QT4_MOC ?= moc$(HOST_SUFF_EXE)
60 - TOOL_QT4_UIC ?= uic$(HOST_SUFF_EXE)
61 - TOOL_QT4_RCC ?= rcc$(HOST_SUFF_EXE)
62 - TOOL_QT4_LRC ?= lrelease$(HOST_SUFF_EXE)
63 - TOOL_QT4_LUPDATE ?= lupdate$(HOST_SUFF_EXE)
64 + TOOL_QT4_MOC ?= moc-qt4$(HOST_SUFF_EXE)
65 + TOOL_QT4_UIC ?= uic-qt4$(HOST_SUFF_EXE)
66 + TOOL_QT4_RCC ?= rcc-qt4$(HOST_SUFF_EXE)
67 + TOOL_QT4_LRC ?= lrelease-qt4$(HOST_SUFF_EXE)
68 + TOOL_QT4_LUPDATE ?= lupdate-qt4$(HOST_SUFF_EXE)
71 # General Properties used by kBuild and/or units/qt.kmk