Changeset 40564 in vbox for trunk

Timestamp:

Mar 21, 2012 1:39:49 PM (13 years ago)

Author:

vboxsync

Message:

Config.kmk/tools: allow to download linux.*.qt from the tools server (disabled by default)

File:

• trunk/Config.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -3997 +3997 @@
  endif
 
- ifdef VBOX_WITH_QT4_SUN
-  VBOX_QT4_INFIX=VBox
- endif
-
- VBOX_QT4_MOD = QtCore QtGui QtNetwork $(if $(VBOX_GUI_USE_QGL),QtOpenGL,)
- VBOX_QT4_MOD_NAMES = $(foreach qtmod,$(VBOX_QT4_MOD),$(qtmod)$(VBOX_QT4_INFIX))
-
  #
  # Handmade configuration of qt4 - very annoying, this needs to
@@ -4020 +4013 @@
   else if1of ($(KBUILD_TARGET), win)
    VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
-  else if1of ($(KBUILD_TARGET), solaris)
+  else if1of ($(KBUILD_TARGET), linux solaris)
    VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
    ifneq ($(VBOX_PATH_QT4),)
@@ -4036 +4029 @@
  VBOX_PATH_QT4            ?= /usr
  VBOX_PATH_QT4_LIB        ?= $(VBOX_PATH_QT4)/lib
+
+ ifdef VBOX_WITH_QT4_SUN
+  VBOX_QT4_INFIX=VBox
+ endif
+
+ VBOX_QT4_MOD = QtCore QtGui QtNetwork $(if $(VBOX_GUI_USE_QGL),QtOpenGL,)
+ VBOX_QT4_MOD_NAMES = $(foreach qtmod,$(VBOX_QT4_MOD),$(qtmod)$(VBOX_QT4_INFIX))
 
  # Hack LD_LIBRARY_PATH for stuff in tools.