VirtualBox

Changeset 16174 in vbox


Ignore:
Timestamp:
Jan 22, 2009 3:15:31 PM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
41920
Message:

renamed VirtualBox4 to VirtualBox

Location:
trunk
Files:
11 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r16166 r16174  
    277277VBOX_WITH_VBOXBFE = 1
    278278# The Qt 4 GUI.
    279 VBOX_WITH_QT4GUI = 1
     279VBOX_WITH_QTGUI = 1
    280280# The headless frontend.
    281281VBOX_WITH_HEADLESS = 1
    … …  
    480480VBOX_BRAND_LICENSE_TXT               := $(PATH_ROOT)/doc/License.txt
    481481VBOX_BRAND_LICENSE_VER               :=
    482 VBOX_BRAND_GUI_ABOUT_PNG             := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/NonOSE/about.png
    483 VBOX_BRAND_GUI_ABOUT_16PX_PNG        := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/NonOSE/about_16px.png
    484 VBOX_BRAND_GUI_VBOX_16PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/NonOSE/VirtualBox_16px.png
    485 VBOX_BRAND_GUI_VBOX_20PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/NonOSE/VirtualBox_20px.png
    486 VBOX_BRAND_GUI_VBOX_32PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/NonOSE/VirtualBox_32px.png
    487 VBOX_BRAND_GUI_VBOX_40PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/NonOSE/VirtualBox_40px.png
    488 VBOX_BRAND_GUI_VBOX_48PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/NonOSE/VirtualBox_48px.png
    489 VBOX_BRAND_GUI_VBOX_64PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/NonOSE/VirtualBox_64px.png
    490 VBOX_BRAND_GUI_CUBE_42PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/NonOSE/VirtualBox_cube_42px.png
     482VBOX_BRAND_GUI_ABOUT_PNG             := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/about.png
     483VBOX_BRAND_GUI_ABOUT_16PX_PNG        := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/about_16px.png
     484VBOX_BRAND_GUI_VBOX_16PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/VirtualBox_16px.png
     485VBOX_BRAND_GUI_VBOX_20PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/VirtualBox_20px.png
     486VBOX_BRAND_GUI_VBOX_32PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/VirtualBox_32px.png
     487VBOX_BRAND_GUI_VBOX_40PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/VirtualBox_40px.png
     488VBOX_BRAND_GUI_VBOX_48PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/VirtualBox_48px.png
     489VBOX_BRAND_GUI_VBOX_64PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/VirtualBox_64px.png
     490VBOX_BRAND_GUI_CUBE_42PX_PNG         := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/NonOSE/VirtualBox_cube_42px.png
    491491VBOX_BRAND_WIN_INST_DLGBMP           := $(PATH_ROOT)/src/VBox/Installer/win/Binary/Dialog.bmp
    492492VBOX_BRAND_WIN_INST_EXT              :=
    … …  
    508508 VBOX_WITH_VBOXSDL =
    509509 VBOX_WITH_VBOXBFE =
    510  VBOX_WITH_QT4GUI =
     510 VBOX_WITH_QTGUI =
    511511 VBOX_WITH_DEBUGGER_GUI =
    512512 VBOX_WITH_DOCS =
    … …  
    543543 VBOX_WITH_HEADLESS=
    544544 VBOX_WITH_VBOXSDL=
    545  VBOX_WITH_QT4GUI=
     545 VBOX_WITH_QTGUI=
    546546 VBOX_WITH_MAIN=
    547547 VBOX_WITH_DOCS=
    … …  
    560560 VBOX_WITH_VRDP_RDESKTOP=
    561561 VBOX_WITH_TESTSUITE=
    562  VBOX_WITH_QT4GUI=
     562 VBOX_WITH_QTGUI=
    563563 VBOX_WITH_USB=
    564564 VBOX_WITH_EHCI=
    … …  
    653653 # branding
    654654 VBOX_BRAND_BIOS_LOGO          := $(PATH_ROOT)/src/VBox/Devices/Graphics/BIOS/ose_logo.bmp
    655  VBOX_BRAND_GUI_ABOUT_PNG      := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/OSE/about.png
    656  VBOX_BRAND_GUI_ABOUT_16PX_PNG := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/OSE/about_16px.png
    657  VBOX_BRAND_GUI_VBOX_16PX_PNG  := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/OSE/VirtualBox_16px.png
    658  VBOX_BRAND_GUI_VBOX_20PX_PNG  := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/OSE/VirtualBox_20px.png
    659  VBOX_BRAND_GUI_VBOX_32PX_PNG  := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/OSE/VirtualBox_32px.png
    660  VBOX_BRAND_GUI_VBOX_40PX_PNG  := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/OSE/VirtualBox_40px.png
    661  VBOX_BRAND_GUI_VBOX_48PX_PNG  := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/OSE/VirtualBox_48px.png
    662  VBOX_BRAND_GUI_VBOX_64PX_PNG  := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/OSE/VirtualBox_64px.png
    663  VBOX_BRAND_GUI_CUBE_42PX_PNG  := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/OSE/VirtualBox_cube_42px.png
     655 VBOX_BRAND_GUI_ABOUT_PNG      := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about.png
     656 VBOX_BRAND_GUI_ABOUT_16PX_PNG := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about_16px.png
     657 VBOX_BRAND_GUI_VBOX_16PX_PNG  := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_16px.png
     658 VBOX_BRAND_GUI_VBOX_20PX_PNG  := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_20px.png
     659 VBOX_BRAND_GUI_VBOX_32PX_PNG  := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png
     660 VBOX_BRAND_GUI_VBOX_40PX_PNG  := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_40px.png
     661 VBOX_BRAND_GUI_VBOX_48PX_PNG  := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png
     662 VBOX_BRAND_GUI_VBOX_64PX_PNG  := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_64px.png
     663 VBOX_BRAND_GUI_CUBE_42PX_PNG  := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_cube_42px.png
    664664endif
    665665
    … …  
    730730#
    731731ifdef VBOX_HEADLESS
    732  VBOX_WITH_QT4GUI=
     732 VBOX_WITH_QTGUI=
    733733 VBOX_WITH_VBOXSDL=
    734734 VBOX_WITH_VBOXBFE=
    … …  
    743743 VBOX_WITH_VRDP=
    744744 VBOX_WITH_VBOXSDL=
    745  VBOX_WITH_QT4GUI=
     745 VBOX_WITH_QTGUI=
    746746 VBOX_WITH_DEBUGGER_GUI=
    747747 VBOX_WITH_HEADLESS=
    748748endif
    749749
    750 ifndef VBOX_WITH_QT4GUI
     750ifndef VBOX_WITH_QTGUI
    751751 VBOX_WITH_KCHMVIEWER=
    752752endif
    … …  
    28792879# Template for building Qt GUI executables.
    28802880#
    2881 TEMPLATE_VBOXQT4GUIEXE = VBox Qt4 GUI Executable
     2881TEMPLATE_VBOXQT4GUIEXE = VBox Qt GUI Executable
    28822882TEMPLATE_VBOXQT4GUIEXE_USES = qt4
    28832883TEMPLATE_VBOXQT4GUIEXE_QTTOOL = QT4
    … …  
    30243024
    30253025#
    3026 # Template for building Qt4 GUI components.
    3027 #
    3028 TEMPLATE_VBOXQT4GUI = VBox Qt4 GUI Components
     3026# Template for building Qt GUI components.
     3027#
     3028TEMPLATE_VBOXQT4GUI = VBox Qt GUI Components
    30293029TEMPLATE_VBOXQT4GUI_EXTENDS = VBOXQT4GUIEXE
    30303030TEMPLATE_VBOXQT4GUI_LIBS = $(filter-out $(QTMAIN),$(TEMPLATE_VBOXQT4GUIEXE_LIBS))

  • trunk/configure

    r16166 r16174  
    11831183
    11841184#
    1185 # Check for the Qt4 library, needed by VirtualBox4
     1185# Check for the Qt4 library, needed by the VirtualBox frontend
    11861186#
    11871187# Currently not fatal.
    … …  
    19441944
    19451945# emit disable directives corresponding to any --disable-xxx options.
    1946 [ $WITH_XPCOM -eq 0 ]   && cnf_append "VBOX_WITH_MAIN" ""
    1947 [ $WITH_QT4 -eq 0   ]   && cnf_append "VBOX_WITH_QT4GUI" ""
    1948 [ $WITH_SDL_TTF -eq 0 ] && cnf_append "VBOX_WITH_SECURELABEL" ""
     1946[ $WITH_XPCOM -eq 0 ]     && cnf_append "VBOX_WITH_MAIN" ""
     1947[ $WITH_QT4 -eq 0   ]     && cnf_append "VBOX_WITH_QTGUI" ""
     1948[ $WITH_SDL_TTF -eq 0 ]   && cnf_append "VBOX_WITH_SECURELABEL" ""
    19491949[ $WITH_HARDENING -eq 0 ] && cnf_append "VBOX_WITHOUT_HARDENING" "1"
    19501950[ $WITH_HARDENING -eq 2 ] && cnf_append "VBOX_WITH_HARDENING" "2"

  • trunk/src/VBox/Frontends/Makefile.kmk

    r16166 r16174  
    4040  include $(PATH_SUB_CURRENT)/VBoxHeadless/Makefile.kmk
    4141 endif
    42  ifdef VBOX_WITH_QT4GUI
    43   include $(PATH_SUB_CURRENT)/VirtualBox4/Makefile.kmk
     42 ifdef VBOX_WITH_QTGUI
     43  include $(PATH_SUB_CURRENT)/VirtualBox/Makefile.kmk
    4444 endif
    4545endif # !VBOX_ONLY_DOCS

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r16023 r16174  
    2727#
    2828VBOX_VIRTUALBOX4_SRC := $(PATH_SUB_CURRENT)
    29 VBOX_VIRTUALBOX4_OUT_DIR := $(PATH_TARGET)/VirtualBox4/misc
     29VBOX_VIRTUALBOX4_OUT_DIR := $(PATH_TARGET)/VirtualBox/misc
    3030
    3131VBOX_WITH_REGISTRATION := 1
    … …  
    4444#
    4545ifdef VBOX_WITH_HARDENING
    46 PROGRAMS += VirtualBox4Hardened
    47 DLLS += VirtualBox4
     46PROGRAMS += VirtualBoxHardened
     47DLLS += VirtualBox
    4848else
    49 PROGRAMS += VirtualBox4
     49PROGRAMS += VirtualBox
    5050endif
    5151
    … …  
    5656 CLEAN += $(PATH_BIN)/vboxkeyboard.tar.gz
    5757endif
    58 INSTALLS += VirtualBox4.nls
     58INSTALLS += VirtualBox.nls
    5959
    6060
    … …  
    108108
    109109#
    110 # Hardened VirtualBox4.
    111 #
    112 VirtualBox4Hardened_TEMPLATE = VBOXR3HARDENEDEXE
    113 VirtualBox4Hardened_SOURCES = src/hardenedmain.cpp
    114 VirtualBox4Hardened_NAME = VirtualBox
     110# Hardened VirtualBox.
     111#
     112VirtualBoxHardened_TEMPLATE = VBOXR3HARDENEDEXE
     113VirtualBoxHardened_SOURCES = src/hardenedmain.cpp
     114VirtualBoxHardened_NAME = VirtualBox
    115115ifeq ($(KBUILD_TARGET),darwin) ## @todo use .darwin when ticket 36 has been fixed.
    116  #VirtualBox4Hardened_INST.darwin = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
    117  VirtualBox4Hardened_INST = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
     116 #VirtualBoxHardened_INST.darwin = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
     117 VirtualBoxHardened_INST = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
    118118endif
    119119
    … …  
    121121#
    122122# Include Qt project file, we'll use FORMS and TRANSLATIONS in
    123 # the VirtualBox4 setup below.
     123# the VirtualBox setup below.
    124124#
    125125SAVED_TEMPLATE := $(TEMPLATE)
    … …  
    128128
    129129#
    130 # VirtualBox4 - The GUI program.
     130# VirtualBox - The GUI program.
    131131#
    132132USES += qt4
    133 VirtualBox4_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQT4GUI,VBOXQT4GUIEXE)
    134 VirtualBox4_NAME = VirtualBox
     133VirtualBox_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQT4GUI,VBOXQT4GUIEXE)
     134VirtualBox_NAME = VirtualBox
    135135ifndef VBOX_WITH_HARDENING      # For the launch trick we need different inode numbers.
    136136 ifeq ($(KBUILD_TARGET),darwin) ## @todo use .darwin when ticket 36 has been fixed.
    137   #VirtualBox4_INST.darwin = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
    138   VirtualBox4_INST = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
     137  #VirtualBox_INST.darwin = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
     138  VirtualBox_INST = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
    139139 endif
    140140endif
    141 VirtualBox4_SDKS.win = WINPSDK DXSDK
     141VirtualBox_SDKS.win = WINPSDK DXSDK
    142142ifeq ($(filter-out freebsd linux netbsd openbsd os2,$(KBUILD_TARGET)),) # X11 + os2 ## @todo solaris
    143  VirtualBox4_SDKS += LIBSDL
     143 VirtualBox_SDKS += LIBSDL
    144144endif
    145145
    … …  
    149149endif
    150150
    151 VirtualBox4_DEFS           = VBOX_GUI_SEPARATE_VM_PROCESS
    152 VirtualBox4_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
    153 VirtualBox4_DEFS.darwin    = VBOX_GUI_USE_QUARTZ2D VBOX_GUI_USE_QIMAGE VBOX_WITHOUT_QHTTP
    154 VirtualBox4_DEFS.freebsd   = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
    155 VirtualBox4_DEFS.linux     = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
    156 VirtualBox4_DEFS.netbsd    = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
    157 VirtualBox4_DEFS.openbsd   = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
    158 VirtualBox4_DEFS.solaris   = VBOX_GUI_USE_QIMAGE #VBOX_GUI_USE_SDL
    159 VirtualBox4_DEFS.win       = VBOX_GUI_USE_QIMAGE UNICODE QT_DLL
    160 VirtualBox4_DEFS.win.amd64 = VBOX_WITHOUT_QHTTP
     151VirtualBox_DEFS           = VBOX_GUI_SEPARATE_VM_PROCESS
     152VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
     153VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QUARTZ2D VBOX_GUI_USE_QIMAGE VBOX_WITHOUT_QHTTP
     154VirtualBox_DEFS.freebsd   = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
     155VirtualBox_DEFS.linux     = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
     156VirtualBox_DEFS.netbsd    = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
     157VirtualBox_DEFS.openbsd   = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
     158VirtualBox_DEFS.solaris   = VBOX_GUI_USE_QIMAGE #VBOX_GUI_USE_SDL
     159VirtualBox_DEFS.win       = VBOX_GUI_USE_QIMAGE UNICODE QT_DLL
     160VirtualBox_DEFS.win.amd64 = VBOX_WITHOUT_QHTTP
    161161## @todo VBOX_WITH_HACKED_QT doesn't apply to Qt4, so why is this still here?
    162 VirtualBox4_DEFS.darwin  += VBOX_WITH_HACKED_QT
     162VirtualBox_DEFS.darwin  += VBOX_WITH_HACKED_QT
    163163ifdef VBOX_WITH_ICHAT_THEATER
    164  VirtualBox4_DEFS.darwin += VBOX_WITH_ICHAT_THEATER
     164 VirtualBox_DEFS.darwin += VBOX_WITH_ICHAT_THEATER
    165165endif
    166166ifneq ($(KBUILD_TYPE),release)
    167167 # non-release builds has some extra features.
    168  VirtualBox4_DEFS.win     += VBOX_GUI_USE_DDRAW
    169 endif
    170 VirtualBox4_DEFS          += \
     168 VirtualBox_DEFS.win     += VBOX_GUI_USE_DDRAW
     169endif
     170VirtualBox_DEFS          += \
    171171        $(if $(VBOX_WITH_REGISTRATION),VBOX_WITH_REGISTRATION) \
    172172        $(if $(VBOX_WITH_REGISTRATION_REQUEST),VBOX_WITH_REGISTRATION_REQUEST) \
    … …  
    177177        $(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT)
    178178if "$(KBUILD_TYPE)" != "release" && defined(VBOX_WITH_DEBUGGER_GUI)
    179  VirtualBox4_DEFS         += VBOX_WITH_DEBUGGER_GUI_MENU
    180 endif
    181 
    182 VirtualBox4_src/main.cpp_DEFS += VBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\"
    183 VirtualBox4_src/main.cpp_DEPS += $(VBOX_VERSION_MK)
    184 
    185 VirtualBox4_INCS           = \
     179 VirtualBox_DEFS         += VBOX_WITH_DEBUGGER_GUI_MENU
     180endif
     181
     182VirtualBox_src/main.cpp_DEFS += VBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\"
     183VirtualBox_src/main.cpp_DEPS += $(VBOX_VERSION_MK)
     184
     185VirtualBox_INCS           = \
    186186        ./include \
    187         $(PATH_VirtualBox4)/include
     187        $(PATH_VirtualBox)/include
    188188
    189189# Necessary for the hdd backend enumeration
    190 VirtualBox4_LIBS = $(LIB_DDU)
     190VirtualBox_LIBS = $(LIB_DDU)
    191191
    192192ifeq ($(KBUILD_TYPE),release)
    193  VirtualBox4_LDFLAGS.win  += /SUBSYSTEM:windows
     193 VirtualBox_LDFLAGS.win  += /SUBSYSTEM:windows
    194194else
    195  VirtualBox4_LDFLAGS.linux+= -rdynamic # for backtrace_symbols()
     195 VirtualBox_LDFLAGS.linux+= -rdynamic # for backtrace_symbols()
    196196 ifeq ($(USERNAME),dmik)
    197   VirtualBox4_LDFLAGS.win += /SUBSYSTEM:windows
     197  VirtualBox_LDFLAGS.win += /SUBSYSTEM:windows
    198198 else
    199   VirtualBox4_LDFLAGS.win += /SUBSYSTEM:console
     199  VirtualBox_LDFLAGS.win += /SUBSYSTEM:console
    200200 endif
    201201endif
    202202# r=bird: what is -lz doing here? it belongs in LIBS.
    203 VirtualBox4_LDFLAGS.darwin = -lz \
     203VirtualBox_LDFLAGS.darwin = -lz \
    204204        -framework IOKit -framework AppKit -framework ApplicationServices -framework Foundation -framework Carbon -framework QuickTime \
    205205        $(if $(VBOX_WITH_HARDENING),-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VirtualBox.dylib)
    206206ifdef VBOX_WITH_ICHAT_THEATER
    207  VirtualBox4_LDFLAGS.darwin += -framework InstantMessage -framework QuartzCore
    208 endif
    209 VirtualBox4_LIBS.win       = \
     207 VirtualBox_LDFLAGS.darwin += -framework InstantMessage -framework QuartzCore
     208endif
     209VirtualBox_LIBS.win       = \
    210210        $(PATH_SDK_WINPSDK_LIB)/Htmlhelp.Lib \
    211211        $(PATH_SDK_DXSDK_LIB)/ddraw.lib \
    212212        $(PATH_SDK_DXSDK_LIB)/dxguid.lib
    213213ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    214  VirtualBox4_LIBS         += $(PATH_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
     214 VirtualBox_LIBS         += $(PATH_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
    215215endif
    216216
    217217# Headers containing definitions of classes that use the Q_OBJECT macro.
    218 VirtualBox4_QT_MOCHDRS = \
     218VirtualBox_QT_MOCHDRS = \
    219219        include/QIHttp.h \
    220220        include/QIWidgetValidator.h \
    … …  
    281281
    282282# Sources containing local definitions of classes that use the Q_OBJECT macro.
    283 VirtualBox4_QT_MOCSRCS = \
     283VirtualBox_QT_MOCSRCS = \
    284284        src/VBoxSelectorWnd.cpp \
    285285        src/VBoxConsoleWnd.cpp \
    286286        src/VBoxMediaManagerDlg.cpp
    287287ifdef VBOX_WITH_XPCOM
    288  VirtualBox4_QT_MOCSRCS += \
     288 VirtualBox_QT_MOCSRCS += \
    289289        src/COMDefs.cpp
    290290endif
    291291
    292 VirtualBox4_SOURCES = \
     292VirtualBox_SOURCES = \
    293293        src/main.cpp \
    294294        src/COMDefs.cpp \
    … …  
    357357ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    358358 ifndef VBOX_OSE
    359   VirtualBox4_QT_MOCHDRS += \
     359  VirtualBox_QT_MOCHDRS += \
    360360        include/VBoxLicenseViewer.h
    361   VirtualBox4_SOURCES += \
     361  VirtualBox_SOURCES += \
    362362        src/VBoxLicenseViewer.cpp
    363363 else
    364   VirtualBox4_VBOX_EXTRA_NLS_SOURCES += \
     364  VirtualBox_VBOX_EXTRA_NLS_SOURCES += \
    365365    include/VBoxLicenseViewer.h \
    366366        src/VBoxLicenseViewer.cpp
    367367 endif
    368  VirtualBox4_SOURCES += \
     368 VirtualBox_SOURCES += \
    369369        src/X11/XKeyboard-new.cpp \
    370370        src/VBoxX11Helper.cpp
    371371else
    372  VirtualBox4_VBOX_EXTRA_NLS_SOURCES += \
     372 VirtualBox_VBOX_EXTRA_NLS_SOURCES += \
    373373    include/VBoxLicenseViewer.h \
    374374        src/VBoxLicenseViewer.cpp
    375375endif
    376376
    377 VirtualBox4_SOURCES.win += \
     377VirtualBox_SOURCES.win += \
    378378        src/VBoxFBDDRAW.cpp \
    379         $(PATH_VirtualBox4)/VirtualBox4.rc
    380 
    381 VirtualBox4_SOURCES.darwin = \
     379        $(PATH_VirtualBox)/VirtualBox.rc
     380
     381VirtualBox_SOURCES.darwin = \
    382382        src/darwin/DarwinKeyboard.cpp \
    383383        src/darwin/VBoxUtils-darwin.cpp \
    … …  
    386386
    387387ifdef VBOX_WITH_ICHAT_THEATER
    388  VirtualBox4_SOURCES.darwin += \
     388 VirtualBox_SOURCES.darwin += \
    389389         src/darwin/VBoxIChatTheaterWrapper.m
    390390endif
    … …  
    392392# The Qt modules we're using.
    393393# (The include directory and lib/framework for each module will be added by the Qt4 unit.)
    394 VirtualBox4_QT_MODULES = Core Gui Network
     394VirtualBox_QT_MODULES = Core Gui Network
    395395
    396396# Import QDesigner UI sources and translations from VBoxUI.pro.
    … …  
    398398 FORMS := $(filter-out ui/VBoxRegistrationDlg.ui,$(FORMS))
    399399endif
    400 $(eval VirtualBox4_SOURCES += $(FORMS))
     400$(eval VirtualBox_SOURCES += $(FORMS))
    401401
    402402# Resource files with some OSE differences (VirtualBoxBrand.qrc is created further down).
    403 VirtualBox4_SOURCES += VirtualBox.qrc
    404 VirtualBox4_SOURCES += $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc
     403VirtualBox_SOURCES += VirtualBox.qrc
     404VirtualBox_SOURCES += $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc
    405405$(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc_RCCFLAGS = -name BRAND
    406406
    407407# Import the translation source from VBoxUI.pro and add the qt_xx_YY counterparts
    408 VirtualBox4_QT_TRANSLATIONS := $(TRANSLATIONS) \
     408VirtualBox_QT_TRANSLATIONS := $(TRANSLATIONS) \
    409409        $(patsubst nls/VirtualBox_%.ts,nls/qt_%.ts, $(filter nls/VirtualBox_%.ts,$(TRANSLATIONS)))
    410410# Compress the translation units.
    411 VirtualBox4_LRCFLAGS = -silent
    412 # Where to install the translations (a separate install target, VirtualBox4-nls-inst is created).
    413 VirtualBox4_QT_TRANSLATIONS_INST = $(INST_BIN)nls/
     411VirtualBox_LRCFLAGS = -silent
     412# Where to install the translations (a separate install target, VirtualBox-nls-inst is created).
     413VirtualBox_QT_TRANSLATIONS_INST = $(INST_BIN)nls/
    414414
    415415
    … …  
    419419# bird: What about $(if $(VBOX_GCC_Wno-missing-base-class-initializer),$(VBOX_GCC_Wno-missing-base-class-initializer),$(VBOX_GCC_Wno-extra))?
    420420ifdef VBOX_WITH_XPCOM
    421  VirtualBox4_src/COMDefs.cpp_CXXFLAGS  = $(VBOX_GCC_Wno-extra)
     421 VirtualBox_src/COMDefs.cpp_CXXFLAGS  = $(VBOX_GCC_Wno-extra)
    422422endif
    423423
    … …  
    426426# Generate the COM wrappers.
    427427#
    428 VirtualBox4_BLDDIRS       += $(PATH_VirtualBox4)/include
    429 VirtualBox4_INTERMEDIATES += $(PATH_VirtualBox4)/include/COMWrappers.h
    430 VirtualBox4_CLEAN         += $(PATH_VirtualBox4)/include/COMWrappers.h
    431 
    432 $$(PATH_VirtualBox4)/include/COMWrappers.h: \
     428VirtualBox_BLDDIRS       += $(PATH_VirtualBox)/include
     429VirtualBox_INTERMEDIATES += $(PATH_VirtualBox)/include/COMWrappers.h
     430VirtualBox_CLEAN         += $(PATH_VirtualBox)/include/COMWrappers.h
     431
     432$$(PATH_VirtualBox)/include/COMWrappers.h: \
    433433                $(PATH_ROOT)/src/VBox/Main/idl/VirtualBox.xidl \
    434434                $(VBOX_VIRTUALBOX4_SRC)/include/COMWrappers.xsl \
    435435                | $$(dir $$@)
    436         $(call MSG_GENERATE,VirtualBox4,$<,$@)
     436        $(call MSG_GENERATE,VirtualBox,$<,$@)
    437437        $(QUIET)$(VBOX_XSLTPROC) -o $@ $(VBOX_VIRTUALBOX4_SRC)/include/COMWrappers.xsl $<
    438438
    439439# alias for generating the COM Wrappers file.
    440 testwrappers:: $$(PATH_VirtualBox4)/include/COMWrappers.h
     440testwrappers:: $$(PATH_VirtualBox)/include/COMWrappers.h
    441441
    442442
    … …  
    444444# Generate qrc file with branded icons.
    445445#
    446 VirtualBox4_BLDDIRS       += $(VBOX_VIRTUALBOX4_OUT_DIR)
    447 VirtualBox4_CLEAN         += $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc
     446VirtualBox_BLDDIRS       += $(VBOX_VIRTUALBOX4_OUT_DIR)
     447VirtualBox_CLEAN         += $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc
    448448if "$(KBUILD_HOST)" == "win" ## @todo remove when kBuild ticket #52 has been fixed and deployed.
    449449 VBOX_DRIVE_HACK := $(firstword $(subst :, ,$(PATH_ROOT))):
    … …  
    454454                $(VBOX_VIRTUALBOX4_SRC)/VirtualBoxBrand.qrc \
    455455                | $$(dir $$@)
    456         $(call MSG_GENERATE,VirtualBox4,$<,$@)
     456        $(call MSG_GENERATE,VirtualBox,$<,$@)
    457457        $(QUIET)$(SED) \
    458458                -e 's;@VBOX_ABOUT_PNG@;$(subst $(VBOX_DRIVE_HACK),,$(VBOX_BRAND_GUI_ABOUT_PNG));g' \
    … …  
    474474# The IDI_ICON1 name is Qt specific.
    475475#
    476 $$(PATH_VirtualBox4)/VirtualBox4.rc: $(PATH_SUB_CURRENT)/Makefile.kmk $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$@)
     476$$(PATH_VirtualBox)/VirtualBox.rc: $(PATH_SUB_CURRENT)/Makefile.kmk $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$@)
    477477        $(RM) -f $@
    478478        $(APPEND) $@ 'IDI_ICON1 ICON "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
    479479
    480 VirtualBox4_CLEAN.win += $$(PATH_VirtualBox4)/VirtualBox4.rc
     480VirtualBox_CLEAN.win += $$(PATH_VirtualBox)/VirtualBox.rc
    481481endif # win
    482482
    … …  
    487487# menu won't be translated.
    488488#
    489 INSTALLS += VirtualBox4.lproj
    490 VirtualBox4.lproj_INST = $(INST_VIRTUALBOX)Contents/Resources/
    491 VirtualBox4.lproj_MODE = 755
    492 VirtualBox4.lproj_DIRS := $(addsuffix .lproj,$(VBOX_APPROVED_GUI_LANGUAGES_ALL))
     489INSTALLS += VirtualBox.lproj
     490VirtualBox.lproj_INST = $(INST_VIRTUALBOX)Contents/Resources/
     491VirtualBox.lproj_MODE = 755
     492VirtualBox.lproj_DIRS := $(addsuffix .lproj,$(VBOX_APPROVED_GUI_LANGUAGES_ALL))
    493493
    494494#
    … …  
    496496# The VirtualBoxVM.app helper is for launching VMs (fixes some issues with the dock).
    497497#
    498 INSTALLS += VirtualBox4.app
    499 VirtualBox4.app_INST = $(INST_VIRTUALBOX)Contents/
    500 VirtualBox4.app_MODE = 644
    501 VirtualBox4.app_SOURCES = \
     498INSTALLS += VirtualBox.app
     499VirtualBox.app_INST = $(INST_VIRTUALBOX)Contents/
     500VirtualBox.app_MODE = 644
     501VirtualBox.app_SOURCES = \
    502502        src/darwin/PkgInfo \
    503         $(PATH_VirtualBox4.app)/Info.plist \
     503        $(PATH_VirtualBox.app)/Info.plist \
    504504        $(VBOX_MACOSX_ICON_FILE)=>Resources/virtualbox.icns
    505505
    506 $$(PATH_VirtualBox4.app)/Info.plist: $(PATH_SUB_CURRENT)/src/darwin/Info.plist $(VBOX_VERSION_MK) | $$(@D)/
    507         $(call MSG_GENERATE,VirtualBox4.app,$<,$@)
     506$$(PATH_VirtualBox.app)/Info.plist: $(PATH_SUB_CURRENT)/src/darwin/Info.plist $(VBOX_VERSION_MK) | $$(@D)/
     507        $(call MSG_GENERATE,VirtualBox.app,$<,$@)
    508508        $(QUIET)$(RM) -f $@
    509509        $(QUIET)$(SED) \
    … …  
    514514                $< > $@
    515515
    516 INSTALLS += VirtualBox4VM.app
    517 VirtualBox4VM.app_INST = $(VirtualBox4.app_INST)Resources/VirtualBoxVM.app/Contents/
    518 VirtualBox4VM.app_MODE = 644
    519 VirtualBox4VM.app_SOURCES = \
     516INSTALLS += VirtualBoxVM.app
     517VirtualBoxVM.app_INST = $(VirtualBox.app_INST)Resources/VirtualBoxVM.app/Contents/
     518VirtualBoxVM.app_MODE = 644
     519VirtualBoxVM.app_SOURCES = \
    520520        src/darwin/VM-PkgInfo=>PkgInfo \
    521         $(PATH_VirtualBox4VM.app)/VM-Info.plist=>Info.plist
    522 VirtualBox4VM.app_SYMLINKS = \
     521        $(PATH_VirtualBoxVM.app)/VM-Info.plist=>Info.plist
     522VirtualBoxVM.app_SYMLINKS = \
    523523        MacOS=>../../../MacOS/ \
    524524        Resources=>../../../Resources/
    525525
    526 $$(PATH_VirtualBox4VM.app)/VM-Info.plist: $(PATH_SUB_CURRENT)/src/darwin/VM-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
    527         $(call MSG_GENERATE,VirtualBox4VM.app,$<,$@)
     526$$(PATH_VirtualBoxVM.app)/VM-Info.plist: $(PATH_SUB_CURRENT)/src/darwin/VM-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
     527        $(call MSG_GENERATE,VirtualBoxVM.app,$<,$@)
    528528        $(QUIET)$(RM) -f $@
    529529        $(QUIET)$(SED) \
    … …  
    574574#
    575575updatenls:: \
    576                 $(filter-out %.qrc,$(VirtualBox4_SOURCES) $(VirtualBox4_VBOX_EXTRA_NLS_SOURCES)) \
     576                $(filter-out %.qrc,$(VirtualBox_SOURCES) $(VirtualBox_VBOX_EXTRA_NLS_SOURCES)) \
    577577                $(wildcard include/*.h)
    578578        $(call MSG_L1,lupdate all languages (nls/*.ts))
    … …  
    580580                $^ \
    581581                -ts \
    582                 $(filter-out nls/qt_%.ts,$(VirtualBox4_QT_TRANSLATIONS)) \
     582                $(filter-out nls/qt_%.ts,$(VirtualBox_QT_TRANSLATIONS)) \
    583583                nls/VirtualBox_xx_YY.ts
    584584

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

    r15910 r16174  
    953953#endif
    954954
    955     CProgress progress = vbox.OpenRemoteSession (session, id, "GUI/Qt4", env);
     955    CProgress progress = vbox.OpenRemoteSession (session, id, "GUI/Qt", env);
    956956    if (!vbox.isOk())
    957957    {

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

    r16166 r16174  
    152152//#endif
    153153
    154 //#ifdef VBOX_WITH_QT4GUI
     154//#ifdef VBOX_WITH_QTGUI
    155155    {   kSupIFT_Exe,  kSupID_AppBin,             true, "VirtualBox" SUPLIB_EXE_SUFF },
    156156    {   kSupIFT_Dll,  kSupID_AppPrivArch,        true, "VirtualBox" SUPLIB_DLL_SUFF },

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

    r16166 r16174  
    7373linux-misc_MODE = a+r,u+w
    7474linux-misc_SOURCES = \
    75         $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_32px.png=>VBox.png \
     75        $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_32px.png=>VBox.png \
    7676        $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
    77         $(if $(VBOX_WITH_QT4GUI),$(PATH_linux-misc)/VirtualBox.desktop,)
     77        $(if $(VBOX_WITH_QTGUI),$(PATH_linux-misc)/VirtualBox.desktop,)
    7878linux-misc_CLEAN = $(PATH_linux-misc)/VirtualBox.desktop
    7979
    … …  
    148148
    149149# Qt4 GUI
    150 ifdef VBOX_WITH_QT4GUI
    151  include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/nls/ApprovedLanguages.kmk
     150ifdef VBOX_WITH_QTGUI
     151 include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
    152152 VBOX_LNX_STRIP_BIN += \
    153153        VBoxKeyboard.so \

  • trunk/src/VBox/Installer/solaris/Makefile.kmk

    r16168 r16174  
    107107solaris-doc_SOURCES = \
    108108        $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
    109         $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_64px.png=>VBox.png
     109        $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_64px.png=>VBox.png
    110110
    111111#
    … …  
    117117SOLARIS_STRIP_EXES = \
    118118        VBoxZoneAccess \
    119         $(if $(VBOX_WITH_QT4GUI),VirtualBox,) \
     119        $(if $(VBOX_WITH_QTGUI),VirtualBox,) \
    120120        VBoxManage \
    121121        $(if $(VBOX_WITH_VBOXBFE),VBoxBFE) \
    … …  
    139139        $(if $(VBOX_WITH_SHARED_CLIPBOARD),VBoxSharedClipboard.so,) \
    140140        $(if $(VBOX_WITH_GUEST_PROPS),VBoxGuestPropSvc.so,) \
    141         $(if $(VBOX_WITH_QT4GUI),VBoxKeyboard.so,) \
    142         $(if $(VBOX_WITH_QT4GUI),libVBoxQtCore.so.4,) \
    143         $(if $(VBOX_WITH_QT4GUI),libVBoxQtGui.so.4,) \
    144         $(if $(VBOX_WITH_QT4GUI),accessible/libqtaccessiblewidgets.so,) \
     141        $(if $(VBOX_WITH_QTGUI),\
     142          VBoxKeyboard.so \
     143          libVBoxQtCore.so.4 \
     144          libVBoxQtGui.so.4 \
     145          accessible/libqtaccessiblewidgets.so,) \
    145146        $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so,) \
    146147        $(if $(VBOX_WITH_CROGL),\
    … …  
    157158        $(if $(VBOX_WITH_VBOXBFE),VBoxBFE.so) \
    158159        $(if $(VBOX_WITH_VBOXSDL),VBoxSDL.so,) \
    159         $(if $(VBOX_WITH_QT4GUI),VirtualBox.so,)
     160        $(if $(VBOX_WITH_QTGUI),VirtualBox.so,)
    160161endif
    161162
    … …  
    184185        components/VBoxXPCOMBase.xpt \
    185186        components/VirtualBox_XPCOM.xpt \
    186         $(if $(and $(VBOX_LICENSE_FILES),$(VBOX_WITH_QT4GUI)),$(VBOX_LICENSE_FILES))
     187        $(if $(and $(VBOX_LICENSE_FILES),$(VBOX_WITH_QTGUI)),$(VBOX_LICENSE_FILES))
    187188
    188189# Things packed explicitly, not from $(PATH_BIN), track these to clean-up properly
    … …  
    198199        $(if $(not $(VBOX_WITH_NETFLT))vnic_setup.sh,) \
    199200        $(if $(not $(VBOX_WITH_NETFLT))vnic_term.sh,) \
    200         $(if $(VBOX_WITH_QT4GUI),virtualbox.desktop,) \
     201        $(if $(VBOX_WITH_QTGUI),virtualbox.desktop,) \
    201202        virtualbox-webservice.xml \
    202203        virtualbox-zoneaccess.xml \
    … …  
    208209
    209210# These extra Qt libs are purely for running VBoxQtconfig
    210 ifdef VBOX_WITH_QT4GUI
     211ifdef VBOX_WITH_QTGUI
    211212 SOLARIS_QTLIBS = libVBoxQtNetwork.so.4 \
    212213        libVBoxQtXml.so.4 \
    … …  
    216217
    217218
    218 ifdef VBOX_WITH_QT4GUI
    219  include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/nls/ApprovedLanguages.kmk
     219ifdef VBOX_WITH_QTGUI
     220 include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
    220221 SOLARIS_NO_STRIP += $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm)
    221222endif
    … …  
    352353                $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)) \
    353354                $(if $(VBOX_OSE),,$(PATH_BIN)/LICENSE) \
    354                 $(if $(and $(VBOX_LICENSE_BINS),$(VBOX_WITH_QT4GUI)),$(VBOX_LICENSE_BINS),) \
     355                $(if $(and $(VBOX_LICENSE_BINS),$(VBOX_WITH_QTGUI)),$(VBOX_LICENSE_BINS),) \
    355356                $(PATH_ROOT)/src/VBox/HostDrivers/Support/solaris/vboxdrv.conf \
    356357                $(if $(VBOX_WITH_NETFLT),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf) \
    … …  
    385386        $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(SOLARIS_OUT_BIN_32)/VBoxPython.so    $(SOLARIS_INST_DIR_32)/VBoxPython.so,)
    386387        $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(SOLARIS_OUT_BIN_64)/VBoxPython.so    $(SOLARIS_INST_DIR_64)/$(VBOX_SOL_PYTHON_DIR_64)/VBoxPython.so,)
    387         $(QUIET)$(if $(VBOX_WITH_QT4GUI),$(INSTALL) -m 0755 $(PATH_DEVTOOLS)/solaris.x86/qt/v4.3.3-r1/bin/qtconfig           $(SOLARIS_INST_DIR_32)/VBoxQtconfig,)
    388         $(QUIET)$(if $(VBOX_WITH_QT4GUI),$(INSTALL) -m 0755 $(PATH_DEVTOOLS)/solaris.amd64/qt/v4.3.3-r1/bin/qtconfig         $(SOLARIS_INST_DIR_64)/VBoxQtconfig,)
     388        $(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0755 $(PATH_DEVTOOLS)/solaris.x86/qt/v4.3.3-r1/bin/qtconfig            $(SOLARIS_INST_DIR_32)/VBoxQtconfig,)
     389        $(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0755 $(PATH_DEVTOOLS)/solaris.amd64/qt/v4.3.3-r1/bin/qtconfig          $(SOLARIS_INST_DIR_64)/VBoxQtconfig,)
    389390        $(QUIET)$(INSTALL) -m 0755 $(SOLARIS_OUT_BIN_32)/VBoxISAExec                                                         $(SOLARIS_INST_DIR)/VBoxISAExec
    390391else
    … …  
    395396        $(QUIET)$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(SOLARIS_OUT_BIN)/VBoxPython.so       $(SOLARIS_INST_DIR_ISA)/$(if $(SOL64_PKG),$(VBOX_SOL_PYTHON_DIR_64)/,)VBoxPython.so
    396397 endif
    397         $(QUIET)$(if $(VBOX_WITH_QT4GUI),$(INSTALL) -m 0755 $(PATH_DEVTOOLS_TRG)/qt/v4.3.3-r1/bin/qtconfig                   $(SOLARIS_INST_DIR_ISA)/VBoxQtconfig,)
     398        $(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0755 $(PATH_DEVTOOLS_TRG)/qt/v4.3.3-r1/bin/qtconfig                    $(SOLARIS_INST_DIR_ISA)/VBoxQtconfig,)
    398399        $(QUIET)$(INSTALL) -m 0755 $(SOLARIS_OUT_BIN)/VBoxISAExec                                                            $(SOLARIS_INST_DIR)/VBoxISAExec
    399400endif
    … …  
    410411        $(QUIET)$(RM) -f $(SOLARIS_INST_DIR)/vboxdrv.sh.tmp
    411412        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/VBox.sh                                            $(SOLARIS_INST_DIR)/VBox.sh
    412         $(QUIET)$(if $(VBOX_WITH_QT4GUI),$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/virtualbox.desktop        $(SOLARIS_INST_DIR)/virtualbox.desktop,)
     413        $(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/virtualbox.desktop         $(SOLARIS_INST_DIR)/virtualbox.desktop,)
    413414        $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_OUT_BIN)/VBox.png                                                  $(SOLARIS_INST_DIR)/VBox.png
    414415        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/postinstall.sh                                     $(SOLARIS_INST_DIR)/postinstall.sh

  • trunk/src/VBox/Main/MachineImpl.cpp

    r16166 r16174  
    36703670    Bstr type (aType);
    36713671
    3672     /* Qt4 is default */
    3673 #ifdef VBOX_WITH_QT4GUI
    3674     if (type == "gui" || type == "GUI/Qt4")
     3672    /* Qt is default */
     3673#ifdef VBOX_WITH_QTGUI
     3674    if (type == "gui" || type == "GUI/Qt")
    36753675    {
    36763676# ifdef RT_OS_DARWIN /* Avoid Launch Services confusing this with the selector by using a helper app. */
    … …  
    36913691        vrc = RTProcCreate (path, args, env, 0, &pid);
    36923692    }
    3693 #else /* !VBOX_WITH_QT4GUI */
     3693#else /* !VBOX_WITH_QTGUI */
    36943694    if (0)
    36953695        ;
    3696 #endif /* VBOX_WITH_QT4GUI */
     3696#endif /* VBOX_WITH_QTGUI */
    36973697
    36983698    else

  • trunk/src/VBox/Main/Makefile.kmk

    r16166 r16174  
    175175        $(if $(VBOX_WITH_VRDP),VBOX_WITH_VRDP,) \
    176176        $(if $(VBOX_WITH_HEADLESS),VBOX_WITH_HEADLESS,) \
    177         $(if $(VBOX_WITH_QT4GUI),VBOX_WITH_QT4GUI,) \
     177        $(if $(VBOX_WITH_QTGUI),VBOX_WITH_QTGUI,) \
    178178        $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
    179179        $(if $(VBOX_MAIN_RELEASE_LOG),VBOX_MAIN_RELEASE_LOG LOG_ENABLED,) \

  • trunk/src/VBox/Main/idl/VirtualBox.xidl

    r16089 r16174  
    4040 *     of the Main API)
    4141 *
    42  * 6. src/VBox/Frontends/VirtualBox4/include/COMWrappers.xsl =>
    43  *    out/<platform>/obj/src/VBox/Frontends/VirtualBox4/VirtualBox/include/COMWrappers.h
    44  *    (smart Qt-based C++ wrapper classes for COM interfaces
    45  *     of the Main API)
    46  *
    47  * 7. src/VBox/Installer/win32/VirtualBox_TypeLib.xsl =>
     42 * 6. src/VBox/Installer/win32/VirtualBox_TypeLib.xsl =>
    4843 *    out/<platform>/obj/src/VBox/Installer/win32/VirtualBox_TypeLib.wxi
    4944 *    (Main API TypeLib block for the WiX installer)
    5045 *
    51  * 8. src/VBox/Runtime/common/err/errmsgvboxcom.xsl =>
     46 * 7. src/VBox/Runtime/common/err/errmsgvboxcom.xsl =>
    5247 *    out/<platform>/obj/Runtime/errmsgvboxcomdata.h
    5348 *    (<result> extraction for the %Rhrc format specifier)
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette