Changeset 16166 in vbox

Timestamp:

Jan 22, 2009 1:58:12 PM (16 years ago)

Author:

vboxsync

Message:

purge the obsolete Qt3 GUI

Location:

trunk

Files:

• Config.kmk (modified) (9 diffs)
• Makefile.kmk (modified) (1 diff)
• configure (modified) (10 diffs)
• src/VBox/Frontends/Makefile.kmk (modified) (1 diff)
• src/VBox/Frontends/VirtualBox (deleted)
• src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp (modified) (1 diff)
• src/VBox/Installer/linux/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/MachineImpl.cpp (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/glue/initterm.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -276 +276 @@
 # The basic frontend (w/o Main).
 VBOX_WITH_VBOXBFE = 1
-# The Qt GUI.
-VBOX_WITH_QTGUI = 1
 # The Qt 4 GUI.
 VBOX_WITH_QT4GUI = 1
@@ -510 +508 @@
  VBOX_WITH_VBOXSDL =
  VBOX_WITH_VBOXBFE =
- VBOX_WITH_QTGUI =
  VBOX_WITH_QT4GUI =
  VBOX_WITH_DEBUGGER_GUI =
@@ -533 +530 @@
  VBOX_WITH_VRDP_AUTHMOD=
  VBOX_WITH_VRDP_RDESKTOP=
- VBOX_WITH_QTGUI=
  VBOX_WITH_TESTSUITE=
  VBOX_WITH_USB=
@@ -547 +543 @@
  VBOX_WITH_HEADLESS=
  VBOX_WITH_VBOXSDL=
- VBOX_WITH_QTGUI=
  VBOX_WITH_QT4GUI=
  VBOX_WITH_MAIN=
@@ -647 +642 @@
  VBOX_WITH_FFMPEG=
  VBOX_WITH_CROGL=
- ifeq ($(KBUILD_TARGET),darwin)
-  # Qt/Mac v3.3.x requires patching to work for us.
-  VBOX_WITH_QTGUI=
- endif
  ifn1of ($(KBUILD_TARGET), linux solaris)
   # Only the Linux, Solaris installers are public
@@ -739 +730 @@
 #
 ifdef VBOX_HEADLESS
- VBOX_WITH_QTGUI=
  VBOX_WITH_QT4GUI=
  VBOX_WITH_VBOXSDL=
@@ -753 +743 @@
  VBOX_WITH_VRDP=
  VBOX_WITH_VBOXSDL=
- VBOX_WITH_QTGUI=
  VBOX_WITH_QT4GUI=
  VBOX_WITH_DEBUGGER_GUI=
@@ -1765 +1754 @@
 SDK_VBOX_NTDLL = Requires W2K3DDK
 SDK_VBOX_NTDLL_LIBS ?= $(PATH_SDK_W2K3DDK_LIB)/ntdll.lib
-
-
-#
-# Qt build tools and libraries.
-# For *NIX we require it to be present on the system.
-#
-## @todo convert this into SDK and integrate the Qt stuff into kBuild.
-## @todo remove this section when win and darwin cases are moved to kBuild/units/qt3.kmk.
-##       vbox/Makefile.kmk that uses VBX_DLL_QT and others needs to be corrected too
-ifeq ($(KBUILD_TARGET),win)
- VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v3.*)))
- VBOX_DLL_QT ?= $(firstword $(wildcard $(VBOX_PATH_QT)/bin/VBoxQt3*.dll) \
-                            $(wildcard $(VBOX_PATH_QT)/bin/qtmt3*.dll) \
-                            $(wildcard $(VBOX_PATH_QT)/bin/qt-mt3*.dll) \
-                            $(wildcard $(VBOX_PATH_QT)/lib/qt-mt3*.dll))
- ifneq ($(wildcard $(VBOX_PATH_QT)/bin/accessible/VBoxQtWidgets100.dll),)
-  VBOX_QT_BINARIES += \
-    $(VBOX_PATH_QT)/bin/accessible/VBoxQtWidgets100.dll=>accessible/VBoxQtWidgets100.dll
- endif
- LIB_QT ?= $(firstword $(wildcard $(VBOX_PATH_QT)/lib/VBoxQt3*.lib) \
-                       $(wildcard $(VBOX_PATH_QT)/lib/qt-mt3*.lib) \
-                       $(wildcard $(VBOX_PATH_QT)/lib/dynamic/qt-mt3*.lib))
- LIB_QT_PRL ?= $(firstword $(wildcard $(VBOX_PATH_QT)/lib/VBoxQt.prl) \
-                           $(wildcard $(VBOX_PATH_QT)/lib/qt-mt.prl) \
-                           $(wildcard $(VBOX_PATH_QT)/lib/dynamic/qt-mt.prl))
- LIB_QTMAIN ?= $(firstword $(wildcard $(VBOX_PATH_QT)/lib/qtmain.lib) \
-                           $(wildcard $(VBOX_PATH_QT)/lib/dynamic/qtmain.lib))
- QTDIR ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/qt/v3.*)))
-else ifeq ($(KBUILD_TARGET),os2)
- QTDIR ?= $(PATH_DEVTOOLS_TRG)/qt/v3.3.1
- VBOX_PATH_QT ?= $(QTDIR)
- VBOX_DLL_QT ?= $(lastword $(sort $(wildcard $(VBOX_PATH_QT)/bin/*qt*.dll)))
- LIB_QT ?= $(lastword $(sort $(wildcard $(VBOX_PATH_QT)/lib/*qt*.lib)))
- LIB_QT_PRL ?= $(lastword $(sort $(wildcard $(VBOX_PATH_QT)/lib/*qt*.prl)))
- QTDIR := $(VBOX_PATH_QT)
-else ifeq ($(KBUILD_TARGET),darwin)
- ifndef VBOX_PATH_QT
-  VBOX_PATH_QT := $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v3.*)))
-  VBOX_PATH_QT ?= $(PATH_DEVTOOLS_TRG)/qt/v3.3.8-r1
- endif
- VBOX_MUST_INSTALL_LIB_QT ?= 1
- LIB_QT ?= $(VBOX_PATH_QT)/lib/libqt-mt.3.dylib
- LIB_QTMAIN ?= $(NO_SUCH_VARIABLE)
- ifndef QTDIR
-  QTDIR := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/v*))
-  QTDIR := $(call lastword,$(QTDIR))
- endif
-else
- ifndef QTDIR
-  ifndef VBOX_PATH_QT
-   # If QTDIR and VBOX_WITH_QTGUI aren't defined, we'll first
-   # look in the tools tree and then on the system. If in the
-   # tools, we'll have to install it.
-   # Results are exported to avoid having to do this for every make file.
-   VBOX_PATH_QT := $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v3.*)))
-   ifneq ($(VBOX_PATH_QT),)
-    export VBOX_PATH_QT
-    export VBOX_MUST_INSTALL_LIB_QT := 1
-    export LIB_QT := $(VBOX_PATH_QT)/lib/libqt-mt.so.3
-    export LD_LIBRARY_PATH := $(VBOX_PATH_QT)/lib:$(LD_LIBRARY_PATH)
-   else
-    QTDIR := $(wildcard /usr/share/qt3)
-    ifeq ($(QTDIR),)
-     QTDIR := $(patsubst %/bin/moc,%,$(firstword $(wildcard /usr/bin/moc /usr/local/bin/moc /usr/X11R6/bin/moc)))
-    endif
-    ifneq ($(QTDIR),)
-     export QTDIR
-    endif
-   endif
-  else
-   QTDIR := $(VBOX_PATH_QT)
-   export QTDIR
-  endif
- endif
-endif
-ifndef VBOX_PATH_QT
- VBOX_PATH_QT := $(QTDIR)
- LIB_QT ?= qt-mt
-endif
-ifeq ($(KBUILD_HOST),$(KBUILD_TARGET))
- VBOX_PATH_QT_HOST ?= $(VBOX_PATH_QT)
-else
- VBOX_PATH_QT_HOST ?= $(QTDIR)
-endif
-VBOX_UIC      ?= $(VBOX_PATH_QT_HOST)/bin/uic$(HOSTSUFF_EXE)
-VBOX_MOC      ?= $(VBOX_PATH_QT_HOST)/bin/moc$(HOSTSUFF_EXE)
-VBOX_LUPDATE  ?= $(VBOX_PATH_QT_HOST)/bin/lupdate$(HOSTSUFF_EXE)
-VBOX_LRELEASE ?= $(VBOX_PATH_QT_HOST)/bin/lrelease$(HOSTSUFF_EXE)
-
-ifeq ($(KBUILD_TARGET),os2)
- # search DLLs in the EXE directory first (unless VBOX_DLL_QT is set)
- VBOX_DLL_QT_PATH := $(dir $(VBOX_DLL_QT))
- VBOX_DLL_QT_PATH := $(if $(VBOX_DLL_QT_PATH),$(VBOX_DLL_QT_PATH);,)
- VBOX_UIC      := BEGINLIBPATH="$(VBOX_DLL_QT_PATH)$(dir $(VBOX_UIC));$$BEGINLIBPATH" $(VBOX_UIC)
- VBOX_MOC      := BEGINLIBPATH="$(VBOX_DLL_QT_PATH)$(dir $(VBOX_MOC));$$BEGINLIBPATH" $(VBOX_MOC)
- VBOX_LUPDATE  := BEGINLIBPATH="$(VBOX_DLL_QT_PATH)$(dir $(VBOX_LUPDATE));$$BEGINLIBPATH" $(VBOX_LUPDATE)
- VBOX_LRELEASE := BEGINLIBPATH="$(VBOX_DLL_QT_PATH)$(dir $(VBOX_LRELEASE));$$BEGINLIBPATH" $(VBOX_LRELEASE)
-endif
 
 #
@@ -2930 +2821 @@
 
 #
-# Template for building Qt GUI executables.
-#
-TEMPLATE_VBOXQTGUIEXE = VBox Qt GUI Executable
-TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS)
-TEMPLATE_VBOXQTGUIEXE_INCS = \
-        $(VBOX_PATH_QT)/include
-
-ifeq ($(KBUILD_TARGET),win)
- # drag in library configuration (we need QMAKE_PRL_DEFINES)
- ifneq ($(LIB_QT_PRL),)
-  include $(LIB_QT_PRL)
- endif
- TEMPLATE_VBOXQTGUIEXE_TOOL = $(VBOX_VCC_TOOL)
- TEMPLATE_VBOXQTGUIEXE_QT_PREFIX = VBox
- TEMPLATE_VBOXQTGUIEXE_DEFS += \
-    _WIN32_WINNT=0x0500 UNICODE _UNICODE \
-    QT_DLL _CRT_SECURE_NO_DEPRECATE \
-    $(QMAKE_PRL_DEFINES)
- ## @todo VCC70 flags?
- ifdef VBOX_USE_VCC80
-  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS = \
-        -nologo -Zm200 -W3 -MD -Zi -EHsc -Zc:wchar_t-
-  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.debug = -RTCsu
- else
-  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS = \
-        -nologo -Zm200 -W3 -MD -Zi -GX
-  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.debug = -GZ
- endif
- TEMPLATE_VBOXQTGUIEXE_INCS += \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_INC)
- TEMPLATE_VBOXQTGUIEXE_LDFLAGS = \
-        /NOD /NOLOGO /INCREMENTAL:NO /MAPINFO:EXPORTS /DEBUG \
-        /DELAYLOAD:oleaut32.dll
- TEMPLATE_VBOXQTGUIEXE_SDKS = WINPSDK
- TEMPLATE_VBOXQTGUIEXE_LIBS = \
-        $(LIB_QT) \
-        $(LIB_QTMAIN) \
-        $(LIB_RUNTIME) \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcprt.lib \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcrt.lib \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/oldnames.lib \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_LIB)/atls.lib
- TEMPLATE_VBOXQTGUIEXE_POST_CMDS = $(VBOX_SIGN_IMAGE_CMDS)
-
-else # the gcc guys:
- TEMPLATE_VBOXQTGUIEXE_TOOL = $(VBOX_GCC_TOOL)
- TEMPLATE_VBOXQTGUIEXE_DEFS.linux = _REENTRANT
- TEMPLATE_VBOXQTGUIEXE_DEFS.solaris = _REENTRANT
-
- TEMPLATE_VBOXQTGUIEXE_INCS += \
-        $(LIB_SDL_INC)
- TEMPLATE_VBOXQTGUIEXE_CXXFLAGS = \
-        -pipe $(VBOX_GCC_WARN) -frtti -fno-exceptions -Wno-non-virtual-dtor \
-        -Wno-long-long -fshort-wchar -fno-strict-aliasing \
-        $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden)
- TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.x86 = -m32
- TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.amd64 = -m64
- TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.linux = -pthread
- TEMPLATE_VBOXQTGUIEXE_LDFLAGS.x86 = -m32
- TEMPLATE_VBOXQTGUIEXE_LDFLAGS.amd64 = -m64
- TEMPLATE_VBOXQTGUIEXE_LIBS += \
-        $(LIB_SDL) \
-        $(LIB_RUNTIME) \
-        $(LIB_REM) \
-        $(LIB_VMM)
-
- ifeq ($(KBUILD_TARGET),linux)
-  TEMPLATE_VBOXQTGUIEXE_LDFLAGS += $(VBOX_LD_as_needed)
- else ifeq ($(KBUILD_TARGET),darwin)
-  TEMPLATE_VBOXQTGUIEXE_DEFS += $(VBOX_DARWIN_DEF_SDK_DEFS)
-  TEMPLATE_VBOXQTGUIEXE_CFLAGS += $(VBOX_DARWIN_DEF_SDK_CFLAGS)
-  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS += $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
-  TEMPLATE_VBOXQTGUIEXE_OBJCFLAGS += $(VBOX_DARWIN_DEF_SDK_OBJCFLAGS)
-  TEMPLATE_VBOXQTGUIEXE_LDFLAGS.darwin += -bind_at_load
-  TEMPLATE_VBOXQTGUIEXE_LIBS +=
-  TEMPLATE_VBOXQTGUIEXE_LIBPATH +=
- else ifeq ($(KBUILD_TARGET),os2)
-  # drag in library configuration (we need QMAKE_PRL_DEFINES)
-  ifneq ($(LIB_QT_PRL),)
-   include $(LIB_QT_PRL)
-  endif
-  TEMPLATE_VBOXQTGUIEXE_DEFS += $(QMAKE_PRL_DEFINES)
-  TEMPLATE_VBOXQTGUIEXE_LIBS +=
-  TEMPLATE_VBOXQTGUIEXE_LIBPATH +=
- else
-  TEMPLATE_VBOXQTGUIEXE_INCS += \
-        $(VBOX_XCURSOR_INCS)
-  TEMPLATE_VBOXQTGUIEXE_LIBS += \
-        $(VBOX_XCURSOR_LIBS) \
-        Xext \
-        X11 \
-        m \
-        $(LIB_PTHREAD)
-  TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
-        $(VBOX_LIBPATH_X11)
-  ifeq ($(KBUILD_TARGET),freebsd)
-   TEMPLATE_VBOXQTGUIEXE_INCS += \
-        /usr/include \
-        /usr/X11R6/include \
-        /usr/local/include
-   TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
-        /usr/lib \
-        /usr/X11R6/lib \
-        /usr/local/lib
-  endif
-  ifeq ($(KBUILD_TARGET),solaris)
-   TEMPLATE_VBOXQTGUIEXE_LIBS += \
-        rt socket nsl
-  endif
- endif
- ifdef VBOX_WITH_RUNPATH
-  ifeq ($(KBUILD_TARGET),solaris)
-   TEMPLATE_VBOXQTGUIEXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH):$(VBOX_WITH_RUNPATH)/qtgcc/lib'
-  else
-   TEMPLATE_VBOXQTGUIEXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)'
-  endif
- else ifdef VBOX_WITH_ORIGIN
-  ifeq ($(KBUILD_TARGET),solaris)
-   TEMPLATE_VBOXQTGUIEXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN):$$(VBOX_ORIGIN)/qtgcc/lib'
-  else
-   TEMPLATE_VBOXQTGUIEXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)'
-  endif
- endif
-
-endif # !win
-
-# Add COM/XPCOM stuff
-TEMPLATE_VBOXQTGUIEXE_LIBS += \
-        $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB)
-ifdef VBOX_WITH_XPCOM
- ## @todo may be worth creating the VBOX_XPCOM SDK def
- TEMPLATE_VBOXQTGUIEXE_DEFS += VBOX_WITH_XPCOM
- ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
-  TEMPLATE_VBOXQTGUIEXE_DEFS += VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
- endif
- TEMPLATE_VBOXQTGUIEXE_INCS += \
-        $(VBOX_XPCOM_INCS)
- TEMPLATE_VBOXQTGUIEXE_LIBS += \
-        $(LIB_XPCOM)
- TEMPLATE_VBOXQTGUIEXE_INTERMEDIATES += \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
-else
- TEMPLATE_VBOXQTGUIEXE_INCS += \
-        $(VBOX_PATH_SDK)/bindings/mscom/include
- TEMPLATE_VBOXQTGUIEXE_INTERMEDIATES += \
-        $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
-endif
-
-#
-# Template for building Qt GUI components.
-#
-TEMPLATE_VBOXQTGUI = VBox Qt GUI Components
-TEMPLATE_VBOXQTGUI_EXTENDS = VBOXQTGUIEXE
-TEMPLATE_VBOXQTGUI_LIBS = $(filter-out $(QTMAIN),$(TEMPLATE_VBOXQTGUIEXE_LIBS))
-ifeq ($(KBUILD_TARGET),darwin)
- TEMPLATE_VBOXQTGUI_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXQTGUIEXE_LDFLAGS.darwin)) \
-        -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
-endif
-ifeq ($(filter-out solaris.x86 %.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),)
- ifneq ($(KBUILD_TARGET),win)
-  TEMPLATE_VBOXQTGUI_DEFS     = PIC $(TEMPLATE_VBOXQTGUIEXE_DEFS)
-  TEMPLATE_VBOXQTGUI_CFLAGS   = -fPIC $(TEMPLATE_VBOXQTGUIEXE_CFLAGS)
-  TEMPLATE_VBOXQTGUI_CXXFLAGS = -fPIC $(TEMPLATE_VBOXQTGUIEXE_CXXFLAGS)
-  TEMPLATE_VBOXQTGUI_LDFLAGS  = -fPIC $(TEMPLATE_VBOXQTGUIEXE_LDFLAGS)
- endif
-endif
-
-
-#
 # Qt 4
 # Qt 4

trunk/Makefile.kmk

@@ -98 +98 @@
         $(DLL_SDK_LIBSDL_FSLIB)
   endif
- endif
-endif
-
-
-# The Qt DLLs.
-ifneq ($(VBOX_WITH_QTGUI),)
- if1of ($(KBUILD_TARGET), win os2)
-  ifneq ($(strip $(VBOX_DLL_QT)),)
-   bin_SOURCES += \
-    $(VBOX_DLL_QT)=>$(not-dir $(VBOX_DLL_QT))
-  endif
-  ifdef VBOX_QT_BINARIES
-   bin_SOURCES += $(VBOX_QT_BINARIES)
-  endif
- else ifeq ($(VBOX_MUST_INSTALL_LIB_QT),1)
-   bin_SOURCES += \
-        $(LIB_QT)
  endif
 endif

trunk/configure

@@ -57 +57 @@
 WITH_LIBIDL=1
 WITH_GSOAP=0
-WITH_QT3=1
 WITH_QT4=1
 WITH_SDL=1
@@ -95 +94 @@
 PKGCONFIG="`which_wrapper pkg-config`"
 PYTHONDIR="/usr /usr/local"
-QT3DIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3"
-QT3DIR="$QT3DIR /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt"
 QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr/lib64/qt4 /usr"
 QT4DIR_PKGCONFIG=1
@@ -1186 +1183 @@
 
 #
-# Check for the Qt3 library, needed by VirtualBox
-#
-check_qt3()
-{
-  test_header Qt3
-  cat > .tmp_src.cc << EOF
-#include <cstdio>
-#include <qglobal.h>
-extern "C" int main(void)
-{
-  printf("found version %s", QT_VERSION_STR);
-#if QT_VERSION >= 0x030305
-  printf(", OK.\n");
-  return 0;
-#elif QT_VERSION >= 0x030300
-  printf("\n  ** WARNING: QT < 3.3.5 has known problems!\n");
-#else
-  printf(", expected version 3.3.0 or higher\n");
-  return 1;
-#endif
-}
-EOF
-  found_qt=0
-  libs="lib"
-  [ "$LIB" = "lib64" ] && libs="$libs lib64"
-  for q in $QT3DIR; do
-    for l in $libs; do
-      echo "compiling the following source file:" >> $LOG
-      cat .tmp_src.cc >> $LOG
-      echo "using the following command line:" >> $LOG
-      echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt $LIBPTHREAD" >> $LOG
-      $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt $LIBPTHREAD >> $LOG 2>&1
-      if [ $? -eq 0 ]; then
-        if test_execute; then
-          cnf_append "PATH_SDK_QT3" "`cd $q ; pwd`"
-          found_qt=1
-          break
-        fi
-      fi
-    done
-    if [ $found_qt -eq 1 ]; then
-      break
-    fi
-  done
-  if [ $found_qt -ne 1 ]; then
-    echo
-    echo "  Qt3 not found at \"$QT3DIR\" or Qt3 headers not found"
-    echo "  Check the file $LOG for detailed error information."
-    fail
-    return 1
-  fi
-  test_header "Qt3 devtools"
-  if check_avail "$q/bin/moc" QT3DIR/bin; then
-    moc_ver=`$q/bin/moc 2>&1 -v|sed 's+^.*(Qt \(.*\))+\1+'`
-    if [ $? -ne 0 ]; then
-      log_failure "not found"
-      fail
-    else
-      log_success "found version $moc_ver"
-      # cnf_append "VBOX_PATH_QT3" "$q" - later/never?
-      cnf_append "PATH_SDK_QT3"      "$q"
-      cnf_append "PATH_SDK_QT3_LIB"  "$q/$l"
-      cnf_append "PATH_SDK_QT3_INC"  "$q/include"
-      cnf_append "PATH_TOOL_QT3_BIN" "$q/bin"
-    fi
-  fi
-}
-
-
-#
 # Check for the Qt4 library, needed by VirtualBox4
 #
@@ -1276 +1203 @@
       FLGQT4="-framework QtCore"
     else
-      log_failure "Qt4 framework not found (can be disable using --disable-qt4)"
+      log_failure "Qt4 framework not found (can be disabled using --disable-qt4)"
       fail
     fi
@@ -1797 +1724 @@
   --with-linux=DIR         Linux kernel source directory [$LINUX]
   --with-mkisofs=PATH      location of mkisofs [$MKISOFS]
-  --with-qt-dir=DIR        directory for Qt3 headers/libraries [$QT3DIR]
-  --with-qt4-dir=DIR       directory for Qt4 headers/libraries [pkgconfig]
+  --with-qt-dir=DIR        directory for Qt4 headers/libraries [pkgconfig]
   --with-gsoap-dir=PATH    directory for SOAP compiler (soapcpp2 and wsdl2h)
 
@@ -1839 +1765 @@
       fi
       ;;
-    --with-qt-dir=*)
-      QT3DIR=`echo $option | cut -d'=' -f2`
-      ;;
-    --with-qt4-dir=*)
+    --with-qt-dir=*|--with-qt4-dir=*)
       QT4DIR=`echo $option | cut -d'=' -f2`
       QT4DIR_PKGCONFIG=0
@@ -1868 +1791 @@
       ;;
     --disable-qt)
-      WITH_QT3=0
       WITH_QT4=0
-      ;;
-    --disable-qt3)
-      WITH_QT3=0
       ;;
     --disable-qt4)
@@ -1915 +1834 @@
       WITH_SDL_TTF=0
       WITH_X11=0
-      WITH_QT3=0
       WITH_QT4=0
       ;;
@@ -2021 +1939 @@
   # (Qt3 builds for Intel Macs are usually not threaded or for X11. And they
   #  don't contain our patches, which means the result isn't really usable.)
-  WITH_QT3=0
   BUILD_LIBXSLT=1
   BUILD_LIBXML2=1
 fi
 
-if [ "$OS" = "freebsd" ]; then
-  # Qt3 will be gone before the FreeBSD port is completed, so just drop it.
-  WITH_QT3=0
-fi
-
 # emit disable directives corresponding to any --disable-xxx options.
 [ $WITH_XPCOM -eq 0 ]   && cnf_append "VBOX_WITH_MAIN" ""
-[ $WITH_QT3 -eq 0   ]   && cnf_append "VBOX_WITH_QTGUI" ""
 [ $WITH_QT4 -eq 0   ]   && cnf_append "VBOX_WITH_QT4GUI" ""
 [ $WITH_SDL_TTF -eq 0 ] && cnf_append "VBOX_WITH_SECURELABEL" ""
@@ -2066 +1977 @@
 # TODO check for libglu1-mesa-dev (GL/glu.h)
 [ $WITH_X11    -eq 1 ] && check_xcursor
-[ $WITH_QT3    -eq 1 ] && check_qt3
 [ $WITH_QT4    -eq 1 ] && check_qt4
 [ $WITH_PYTHON -eq 1 -a "$OS" != "darwin" ] && check_python

trunk/src/VBox/Frontends/Makefile.kmk

@@ -40 +40 @@
   include $(PATH_SUB_CURRENT)/VBoxHeadless/Makefile.kmk
  endif
- ifdef VBOX_WITH_QTGUI
-  include $(PATH_SUB_CURRENT)/VirtualBox/Makefile.kmk
- endif
  ifdef VBOX_WITH_QT4GUI
   include $(PATH_SUB_CURRENT)/VirtualBox4/Makefile.kmk

trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp

@@ -157 +157 @@
 # if !defined(RT_OS_DARWIN) && !defined(RT_OS_WINDOWS) && !defined(RT_OS_OS2)
     {   kSupIFT_Dll,  kSupID_SharedLib,          true, "VBoxKeyboard" SUPLIB_DLL_SUFF },
-# endif
-//#endif
-
-//#ifdef VBOX_WITH_QTGUI
-    {   kSupIFT_Exe,  kSupID_AppBin,             true, "VirtualBox3" SUPLIB_EXE_SUFF },
-    {   kSupIFT_Dll,  kSupID_AppPrivArch,        true, "VirtualBox3" SUPLIB_DLL_SUFF },
-# if !defined(RT_OS_DARWIN) && !defined(RT_OS_WINDOWS) && !defined(RT_OS_OS2)
-    {   kSupIFT_Dll,  kSupID_SharedLib,          true, "VBoxKeyboard3" SUPLIB_DLL_SUFF },
 # endif
 //#endif

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -73 +73 @@
 linux-misc_MODE = a+r,u+w
 linux-misc_SOURCES = \
-        $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_32px.png=>VBox.png \
+        $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_32px.png=>VBox.png \
         $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
         $(if $(VBOX_WITH_QT4GUI),$(PATH_linux-misc)/VirtualBox.desktop,)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3695 +3695 @@
         ;
 #endif /* VBOX_WITH_QT4GUI */
-
-    else
-
-    /* Qt3 is used sometimes as well, OS/2 does not have Qt4 at all */
-#ifdef VBOX_WITH_QTGUI
-    if (type == "gui" || type == "GUI/Qt3")
-    {
-# ifdef RT_OS_DARWIN /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
-        const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM3";
-# else
-        const char VirtualBox_exe[] = "VirtualBox3" HOSTSUFF_EXE;
-# endif
-        Assert (sz >= sizeof (VirtualBox_exe));
-        strcpy (cmd, VirtualBox_exe);
-
-        Utf8Str idStr = mData->mUuid.toString();
-# ifdef RT_OS_WINDOWS /** @todo drop this once the RTProcCreate bug has been fixed */
-        const char * args[] = {path, "-startvm", idStr, 0 };
-# else
-        Utf8Str name = mUserData->mName;
-        const char * args[] = {path, "-comment", name, "-startvm", idStr, 0 };
-# endif
-        vrc = RTProcCreate (path, args, env, 0, &pid);
-    }
-#else /* !VBOX_WITH_QTGUI */
-    if (0)
-        ;
-#endif /* !VBOX_WITH_QTGUI */
 
     else

trunk/src/VBox/Main/Makefile.kmk

@@ -175 +175 @@
         $(if $(VBOX_WITH_VRDP),VBOX_WITH_VRDP,) \
         $(if $(VBOX_WITH_HEADLESS),VBOX_WITH_HEADLESS,) \
-        $(if $(VBOX_WITH_QTGUI),VBOX_WITH_QTGUI,) \
         $(if $(VBOX_WITH_QT4GUI),VBOX_WITH_QT4GUI,) \
         $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \

trunk/src/VBox/Main/glue/initterm.cpp

@@ -213 +213 @@
     /// if you clear it. For this reason, we disable the code below and
     /// instead initialize COM in MTA as early as possible, before 3rd party
-    /// libraries we use have done so (i.e. Qt3).
+    /// libraries we use have done so (i.e. Qt).
 #if 0
     /* If we fail to set the necessary apartment model, it may mean that some