VirtualBox

Changeset 67067 in vbox


Ignore:
Timestamp:
May 24, 2017 3:43:59 PM (8 years ago)
Author:
vboxsync
Message:

drop VBOX_WITH_QTGUI_V5 and friends

Location:
trunk
Files:
47 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r66918 r67067  
    599599# The Qt GUI.
    600600VBOX_WITH_QTGUI = 1
    601 if1of ($(KBUILD_TARGET), linux win solaris)
    602  VBOX_WITH_QTGUI_V5 = 1 # r=bird: s/VBOX_WITH_QTGUI_V5/VBOX_WITH_QT5/g - our we released version 5.0 of the VirtualBox GUI last year, remember?
    603 else if "$(KBUILD_TARGET)" == "darwin" && $(KBUILD_HOST_VERSION_MAJOR) >= 13 # (OS X 10.9 Mavericks)
    604  VBOX_WITH_QTGUI_V5 = 1
    605 endif
    606601# Indicates the Qt is Cocoa based on the Mac.
    607602ifeq ($(KBUILD_TARGET),darwin)
    … …  
    58155810 ifeq ($(VBOX_PATH_QT),)
    58165811  ifeq ($(KBUILD_TARGET),darwin)
    5817    ifndef VBOX_WITH_QTGUI_V5
    5818     VBOX_PATH_QT := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*)))
    5819    else
    5820     VBOX_PATH_QT := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
    5821    endif
     5812   VBOX_PATH_QT := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
    58225813   ifeq ($(VBOX_PATH_QT),)
    58235814    ifneq ($(wildcard /Library/Frameworks/QtCore.framework),)
    … …  
    58285819   endif
    58295820  else if1of ($(KBUILD_TARGET), win)
    5830    ifndef VBOX_WITH_QTGUI_V5
    5831     VBOX_PATH_QT ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*))))
    5832    else
    5833     VBOX_PATH_QT ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*))))
    5834    endif
     5821   VBOX_PATH_QT ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*))))
    58355822  else if1of ($(KBUILD_TARGET), linux solaris)
    5836    ifndef VBOX_WITH_QTGUI_V5
    5837     VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*)))
    5838    else
    5839     VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
    5840    endif
     5823   VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
    58415824   ifneq ($(VBOX_PATH_QT),)
    58425825    VBOX_WITH_ORACLE_QT = 1
    … …  
    58485831   # gentoo (64-bit)
    58495832   VBOX_PATH_QT          ?= /usr
    5850    ifndef VBOX_WITH_QTGUI_V5
    5851     VBOX_PATH_QT_LIB      ?= /usr/lib/qt4
    5852    else
    5853     VBOX_PATH_QT_LIB      ?= /usr/lib/qt5
    5854    endif
     5833   VBOX_PATH_QT_LIB      ?= /usr/lib/qt5
    58555834  endif
    58565835 endif
    … …  
    58625841 endif
    58635842
    5864  ifndef VBOX_WITH_QTGUI_V5
    5865   VBOX_QT_MOD = QtCore QtGui $(if $(VBOX_GUI_USE_QGL),QtOpenGL,)
    5866  else # VBOX_WITH_QTGUI_V5
    5867   ifeq ($(KBUILD_TARGET), darwin)
    5868    VBOX_QT_MOD = \
    5869     QtCore QtGui QtWidgets QtPrintSupport QtMacExtras \
    5870     $(if $(VBOX_GUI_USE_QGL),QtOpenGL,)
    5871   else if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris win)
    5872    VBOX_QT_MOD += \
    5873     Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport \
    5874     $(if $(VBOX_GUI_USE_QGL),Qt5OpenGL,)
    5875     if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris)
    5876      VBOX_QT_MOD += \
    5877       Qt5DBus Qt5XcbQpa Qt5X11Extras
    5878      # legacy libraries required to be installed on EL5
    5879      VBOX_QT_LEGACY_LIBS = \
    5880       $(if $(VBOX_LD_HAS_LIBXCB),,libxcb.so.1 libX11.so.6 libX11-xcb.so.1)
    5881      VBOX_QT_PLUGINS = plugins/platforms/libqxcb.so
    5882     else ifeq ($(KBUILD_TARGET), win)
    5883      VBOX_QT_MOD += \
    5884       Qt5WinExtras
    5885     endif # win
    5886   endif # linux freebsd netbsd openbsd solaris win
    5887  endif # VBOX_WITH_QTGUI_V5
     5843 ifeq ($(KBUILD_TARGET), darwin)
     5844  VBOX_QT_MOD = \
     5845   QtCore QtGui QtWidgets QtPrintSupport QtMacExtras \
     5846   $(if $(VBOX_GUI_USE_QGL),QtOpenGL,)
     5847 else if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris win)
     5848  VBOX_QT_MOD += \
     5849   Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport \
     5850   $(if $(VBOX_GUI_USE_QGL),Qt5OpenGL,)
     5851   if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris)
     5852    VBOX_QT_MOD += \
     5853     Qt5DBus Qt5XcbQpa Qt5X11Extras
     5854    # legacy libraries required to be installed on EL5
     5855    VBOX_QT_LEGACY_LIBS = \
     5856     $(if $(VBOX_LD_HAS_LIBXCB),,libxcb.so.1 libX11.so.6 libX11-xcb.so.1)
     5857    VBOX_QT_PLUGINS = plugins/platforms/libqxcb.so
     5858   else ifeq ($(KBUILD_TARGET), win)
     5859    VBOX_QT_MOD += \
     5860     Qt5WinExtras
     5861   endif # win
     5862 endif # linux freebsd netbsd openbsd solaris win
    58885863
    58895864 VBOX_QT_MOD_NAMES = $(foreach qtmod,$(VBOX_QT_MOD),$(qtmod)$(VBOX_QT_INFIX))
    … …  
    59015876 #
    59025877 TEMPLATE_VBOXQTGUIEXE = VBox Qt GUI Executable
    5903  ifndef VBOX_WITH_QTGUI_V5
    5904   TEMPLATE_VBOXQTGUIEXE_USES = qt4
    5905   TEMPLATE_VBOXQTGUIEXE_QTTOOL = QT4
    5906   TEMPLATE_VBOXQTGUIEXE_MOCTOOL = QT4
    5907   TEMPLATE_VBOXQTGUIEXE_UICTOOL = QT4
    5908   TEMPLATE_VBOXQTGUIEXE_RCCTOOL = QT4
    5909   TEMPLATE_VBOXQTGUIEXE_LRCTOOL = QT4
    5910   TEMPLATE_VBOXQTGUIEXE_SDKS = QT4
    5911  else # VBOX_WITH_QTGUI_V5
    5912   TEMPLATE_VBOXQTGUIEXE_USES = qt5
    5913   TEMPLATE_VBOXQTGUIEXE_QTTOOL = QT5
    5914   TEMPLATE_VBOXQTGUIEXE_MOCTOOL = QT5
    5915   TEMPLATE_VBOXQTGUIEXE_UICTOOL = QT5
    5916   TEMPLATE_VBOXQTGUIEXE_RCCTOOL = QT5
    5917   TEMPLATE_VBOXQTGUIEXE_LRCTOOL = QT5
    5918   TEMPLATE_VBOXQTGUIEXE_SDKS = QT5
    5919   TEMPLATE_VBOXQTGUIEXE_MOCDEFS.darwin += QT_VERSION=0x050602
    5920  endif # VBOX_WITH_QTGUI_V5
     5878 TEMPLATE_VBOXQTGUIEXE_USES = qt5
     5879 TEMPLATE_VBOXQTGUIEXE_QTTOOL = QT5
     5880 TEMPLATE_VBOXQTGUIEXE_MOCTOOL = QT5
     5881 TEMPLATE_VBOXQTGUIEXE_UICTOOL = QT5
     5882 TEMPLATE_VBOXQTGUIEXE_RCCTOOL = QT5
     5883 TEMPLATE_VBOXQTGUIEXE_LRCTOOL = QT5
     5884 TEMPLATE_VBOXQTGUIEXE_SDKS = QT5
     5885 TEMPLATE_VBOXQTGUIEXE_MOCDEFS.darwin += QT_VERSION=0x050602
    59215886 TEMPLATE_VBOXQTGUIEXE_QT_INFIX = $(VBOX_QT_INFIX)
    59225887 TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS)
    … …  
    60125977    TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
    60135978        $(VBOX_LIBPATH_X11)
    6014    if defined(VBOX_WITH_QTGUI_V5) && defined(VBOX_WITH_ORACLE_QT) && !defined(VBOX_LD_HAS_LIBXCB)
     5979   if defined(VBOX_WITH_ORACLE_QT) && !defined(VBOX_LD_HAS_LIBXCB)
    60155980    TEMPLATE_VBOXQTGUIEXE_LIBPATH += $(PATH_SDK_QT5_LIB)/legacy
    60165981    TEMPLATE_VBOXQTGUIEXE_INCS    += $(PATH_SDK_QT5_INC)/legacy
    … …  
    60836048 endif # COM
    60846049
    6085  ifdef VBOX_WITH_QTGUI_V5
    6086   ifn1of ($(KBUILD_TARGET), darwin os2 win)
    6087     TEMPLATE_VBOXQTGUIEXE_DEFS     += PIC
    6088     TEMPLATE_VBOXQTGUIEXE_CFLAGS   += -fPIC
    6089     TEMPLATE_VBOXQTGUIEXE_CXXFLAGS += -fPIC
    6090     TEMPLATE_VBOXQTGUIEXE_LDFLAGS  += -fPIC
    6091   endif # not darwin, os2 or win
    6092  endif # VBOX_WITH_QTGUI_V5
     6050 ifn1of ($(KBUILD_TARGET), darwin os2 win)
     6051   TEMPLATE_VBOXQTGUIEXE_DEFS     += PIC
     6052   TEMPLATE_VBOXQTGUIEXE_CFLAGS   += -fPIC
     6053   TEMPLATE_VBOXQTGUIEXE_CXXFLAGS += -fPIC
     6054   TEMPLATE_VBOXQTGUIEXE_LDFLAGS  += -fPIC
     6055 endif # not darwin, os2 or win
    60936056
    60946057

  • trunk/Makefile.kmk

    r66918 r67067  
    149149#       the Info.plist file goes into Resources.
    150150#
    151 ifndef VBOX_WITH_QTGUI_V5
    152  ifeq ($(KBUILD_TARGET),darwin)
    153   include $(KBUILD_PATH)/units/qt4.kmk
    154   INSTALLS += qt4-bin
    155   qt4-bin_MODE = 755
    156   qt4-bin_INST = $(INST_VIRTUALBOX)Contents/
    157   qt4-bin_SOURCES = $(foreach qtmod,$(VBOX_QT_MOD_NAMES) \
    158    ,$(PATH_SDK_QT4_LIB)/$(qtmod).framework/Versions/4/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
    159     $(PATH_SDK_QT4_LIB)/$(qtmod).framework/Contents/Info.plist=>Frameworks/$(qtmod).framework/Versions/4/Resources/Info.plist \
    160       )
    161   ifdef VBOX_WITH_COCOA_QT
    162    qt4-bin_SOURCES += \
    163     $(PATH_SDK_QT4_LIB)/QtGui$(VBOX_QT_INFIX).framework/Versions/4/Resources/qt_menu.nib/classes.nib=>Frameworks/QtGui$(VBOX_QT_INFIX).framework/Versions/4/Resources/qt_menu.nib/classes.nib \
    164     $(PATH_SDK_QT4_LIB)/QtGui$(VBOX_QT_INFIX).framework/Versions/4/Resources/qt_menu.nib/info.nib=>Frameworks/QtGui$(VBOX_QT_INFIX).framework/Versions/4/Resources/qt_menu.nib/info.nib \
    165     $(PATH_SDK_QT4_LIB)/QtGui$(VBOX_QT_INFIX).framework/Versions/4/Resources/qt_menu.nib/keyedobjects.nib=>Frameworks/QtGui$(VBOX_QT_INFIX).framework/Versions/4/Resources/qt_menu.nib/keyedobjects.nib
    166   endif
    167   ifneq ($(wildcard $(VBOX_PATH_QT)/plugins/accessible/libqtaccessiblewidgets.dylib),)
    168    qt4-bin_SOURCES += \
    169     $(VBOX_PATH_QT)/plugins/accessible/libqtaccessiblewidgets.dylib=>MacOS/accessible/libqtaccessiblewidgets.dylib
    170   endif
    171   qt4-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT_MOD_NAMES) \
    172    ,Frameworks/$(qtmod).framework/Versions/Current=>4 \
    173     Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod) \
    174     Frameworks/$(qtmod).framework/Resources=>Versions/4/Resources)
    175  else
    176   if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
    177    include $(KBUILD_PATH)/units/qt4.kmk
    178    ifeq ($(KBUILD_TARGET),win)
    179     INSTALLS += qt4-bin
    180     qt4-bin_MODE = 755
    181     qt4-bin_INST = $(INST_BIN)
    182     qt4-bin_SOURCES = \
    183      $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(call VBOX_RE_SIGN_DLL_FN,qt4-bin,$(VBOX_PATH_QT_LIB)/$(qtmod)4$(SUFF_DLL))) \
    184      $(call VBOX_RE_SIGN_DLL_FN,qt4-bin,$(VBOX_PATH_QT)/plugins/accessible/qtaccessiblewidgets4$(SUFF_DLL))=>accessible/qtaccessiblewidgets4$(SUFF_DLL)
    185     ifdef VBOX_WITH_QT_PDBS
    186      qt4-bin_SOURCES += \
    187       $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(VBOX_PATH_QT_LIB)/$(qtmod)4.pdb) \
    188       $(VBOX_PATH_QT)/plugins/accessible/qtaccessiblewidgets4.pdb=>accessible/qtaccessiblewidgets4.pdb
    189     endif
    190    else
    191     INSTALLS += qt4-bin
    192     qt4-bin_MODE = 755
    193     qt4-bin_INST = $(INST_BIN)
    194     qt4-bin_SOURCES = \
    195      $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(VBOX_PATH_QT_LIB)/lib$(qtmod)$(SUFF_DLL).4) \
    196      $(VBOX_PATH_QT)/plugins/accessible/libqtaccessiblewidgets$(SUFF_DLL)=>accessible/libqtaccessiblewidgets$(SUFF_DLL)
    197    endif
    198   endif # VBOX_WITH_ORACLE_QT
    199  endif
    200 else # VBOX_WITH_QTGUI_V5
    201  ifeq ($(KBUILD_TARGET),darwin)
    202   include $(KBUILD_PATH)/units/qt5.kmk
    203   INSTALLS += qt5-bin
    204   qt5-bin_MODE = 755
    205   qt5-bin_INST = $(INST_VIRTUALBOX)Contents/
    206   qt5-bin_SOURCES = $(foreach qtmod,$(VBOX_QT_MOD_NAMES), \
    207    $(PATH_SDK_QT5_LIB)/$(qtmod).framework/Versions/5/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/5/$(qtmod) \
    208    $(PATH_SDK_QT5_LIB)/$(qtmod).framework/Versions/5/Resources/Info.plist=>Frameworks/$(qtmod).framework/Versions/5/Resources/Info.plist)
    209   qt5-bin_SOURCES += \
    210    $(PATH_SDK_QT5)/plugins/platforms/libqcocoa$(SUFF_DLL)=>plugins/platforms/libqcocoa$(SUFF_DLL) \
    211    $(PATH_SDK_QT5)/plugins/platforms/libqminimal$(SUFF_DLL)=>plugins/platforms/libqminimal$(SUFF_DLL) \
    212    $(PATH_SDK_QT5)/plugins/platforms/libqoffscreen$(SUFF_DLL)=>plugins/platforms/libqoffscreen$(SUFF_DLL)
    213   qt5-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
    214    Frameworks/$(qtmod).framework/Versions/Current=>5 \
    215    Frameworks/$(qtmod).framework/$(qtmod)=>Versions/5/$(qtmod) \
    216    Frameworks/$(qtmod).framework/Resources=>Versions/5/Resources)
    217  else # win x11
    218   if1of ($(KBUILD_TARGET), linux solaris)
    219    ifndef VBOX_ONLY_BUILD
    220     ifneq ($(VBOX_GCC_VERSION_CXX),)
    221      ifeq ($(int-ge $(VBOX_GCC_VERSION_CXX),40400),)
    222       $(error gcc >= 4.4 required when compiling against Qt5!)
    223      endif
     151ifeq ($(KBUILD_TARGET),darwin)
     152 include $(KBUILD_PATH)/units/qt5.kmk
     153 INSTALLS += qt5-bin
     154 qt5-bin_MODE = 755
     155 qt5-bin_INST = $(INST_VIRTUALBOX)Contents/
     156 qt5-bin_SOURCES = $(foreach qtmod,$(VBOX_QT_MOD_NAMES), \
     157  $(PATH_SDK_QT5_LIB)/$(qtmod).framework/Versions/5/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/5/$(qtmod) \
     158  $(PATH_SDK_QT5_LIB)/$(qtmod).framework/Versions/5/Resources/Info.plist=>Frameworks/$(qtmod).framework/Versions/5/Resources/Info.plist)
     159 qt5-bin_SOURCES += \
     160  $(PATH_SDK_QT5)/plugins/platforms/libqcocoa$(SUFF_DLL)=>plugins/platforms/libqcocoa$(SUFF_DLL) \
     161  $(PATH_SDK_QT5)/plugins/platforms/libqminimal$(SUFF_DLL)=>plugins/platforms/libqminimal$(SUFF_DLL) \
     162  $(PATH_SDK_QT5)/plugins/platforms/libqoffscreen$(SUFF_DLL)=>plugins/platforms/libqoffscreen$(SUFF_DLL)
     163 qt5-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
     164  Frameworks/$(qtmod).framework/Versions/Current=>5 \
     165  Frameworks/$(qtmod).framework/$(qtmod)=>Versions/5/$(qtmod) \
     166  Frameworks/$(qtmod).framework/Resources=>Versions/5/Resources)
     167else # win x11
     168 if1of ($(KBUILD_TARGET), linux solaris)
     169  ifndef VBOX_ONLY_BUILD
     170   ifneq ($(VBOX_GCC_VERSION_CXX),)
     171    ifeq ($(int-ge $(VBOX_GCC_VERSION_CXX),40400),)
     172     $(error gcc >= 4.4 required when compiling against Qt5!)
    224173    endif
    225174   endif
    226175  endif
    227   if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
    228    include $(KBUILD_PATH)/units/qt5.kmk
    229    ifeq ($(KBUILD_TARGET),win)
    230     INSTALLS += qt5-bin
    231     qt5-bin_MODE = 755
    232     qt5-bin_INST = $(INST_BIN)
     176 endif
     177 if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
     178  include $(KBUILD_PATH)/units/qt5.kmk
     179  ifeq ($(KBUILD_TARGET),win)
     180   INSTALLS += qt5-bin
     181   qt5-bin_MODE = 755
     182   qt5-bin_INST = $(INST_BIN)
     183   qt5-bin_SOURCES = \
     184    $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/bin/$(qtmod)$(SUFF_DLL)))
     185   qt5-bin_SOURCES += \
     186    $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/platforms/qwindows$(SUFF_DLL))=>platforms/qwindows$(SUFF_DLL) \
     187    $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/platforms/qminimal$(SUFF_DLL))=>platforms/qminimal$(SUFF_DLL) \
     188    $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/platforms/qoffscreen$(SUFF_DLL))=>platforms/qoffscreen$(SUFF_DLL)
     189   ifdef VBOX_WITH_QT_PDBS
     190    qt5-bin_SOURCES += \
     191     $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(PATH_SDK_QT5)/qt*/$(VBOX_PATH_QT_LIB)/$(qtmod).pdb))
     192   endif # VBOX_WITH_QT_PDBS
     193  else # x11
     194   INSTALLS += qt5-bin
     195   qt5-bin_MODE = 755
     196   qt5-bin_INST = $(INST_BIN)
     197   ifdef VBOX_WITH_HARDENING
     198    # The wildcards are necessary to install the libs instead of the symlinks
    233199    qt5-bin_SOURCES = \
    234      $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/bin/$(qtmod)$(SUFF_DLL)))
    235     qt5-bin_SOURCES += \
    236      $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/platforms/qwindows$(SUFF_DLL))=>platforms/qwindows$(SUFF_DLL) \
    237      $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/platforms/qminimal$(SUFF_DLL))=>platforms/qminimal$(SUFF_DLL) \
    238      $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/platforms/qoffscreen$(SUFF_DLL))=>platforms/qoffscreen$(SUFF_DLL)
    239     ifdef VBOX_WITH_QT_PDBS
    240      qt5-bin_SOURCES += \
    241       $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(PATH_SDK_QT5)/qt*/$(VBOX_PATH_QT_LIB)/$(qtmod).pdb))
    242     endif # VBOX_WITH_QT_PDBS
    243    else # x11
    244     INSTALLS += qt5-bin
    245     qt5-bin_MODE = 755
    246     qt5-bin_INST = $(INST_BIN)
    247     ifdef VBOX_WITH_HARDENING
    248      # The wildcards are necessary to install the libs instead of the symlinks
    249      qt5-bin_SOURCES = \
    250       $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(VBOX_PATH_QT_LIB)/lib$(qtmod).so.*.*.*)=>lib$(qtmod).so.5) \
    251       $(foreach lib,$(VBOX_QT_PLUGINS),$(VBOX_PATH_QT)/$(lib)=>$(lib))
    252       ifneq ($(KBUILD_TARGET),solaris)
    253        qt5-bin_SOURCES += \
    254         $(foreach lib,$(VBOX_QT_LEGACY_LIBS),$(wildcard $(VBOX_PATH_QT_LIB)/legacy/$(lib).*.*)=>legacy/$(lib))
    255       endif # solaris
    256     else # !VBOX_WITH_HARDENING
    257      # For non-hardened builds we need to remove the RUNPATH. This stuff is
    258      # ugly but we need to prevent kBuild from hard-linking otherwise we
    259      # (indirectly) change the binaries in tools
     200     $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(VBOX_PATH_QT_LIB)/lib$(qtmod).so.*.*.*)=>lib$(qtmod).so.5) \
     201     $(foreach lib,$(VBOX_QT_PLUGINS),$(VBOX_PATH_QT)/$(lib)=>$(lib))
    260202     ifneq ($(KBUILD_TARGET),solaris)
    261       QT5_VERSION = 5.6.1
    262      else
    263       QT5_VERSION = 5.5.1
    264      endif
    265      qt5-bin_SOURCES = \
    266       $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.$(QT5_VERSION)=>lib$(qtmod).so.5) \
    267       $(foreach lib,$(VBOX_QT_PLUGINS),$(qt5-bin_0_OUTDIR)/$(lib)=>$(lib))
    268       ifneq ($(KBUILD_TARGET),solaris)
    269        qt5-bin_SOURCES += \
    270         $(foreach lib,$(VBOX_QT_LEGACY_LIBS),$(qt5-bin_0_OUTDIR)/$(lib)=>legacy/$(lib))
    271       endif # solaris
     203      qt5-bin_SOURCES += \
     204       $(foreach lib,$(VBOX_QT_LEGACY_LIBS),$(wildcard $(VBOX_PATH_QT_LIB)/legacy/$(lib).*.*)=>legacy/$(lib))
     205     endif # solaris
     206   else # !VBOX_WITH_HARDENING
     207    # For non-hardened builds we need to remove the RUNPATH. This stuff is
     208    # ugly but we need to prevent kBuild from hard-linking otherwise we
     209    # (indirectly) change the binaries in tools
     210    ifneq ($(KBUILD_TARGET),solaris)
     211     QT5_VERSION = 5.6.1
     212    else
     213     QT5_VERSION = 5.5.1
     214    endif
     215    qt5-bin_SOURCES = \
     216     $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.$(QT5_VERSION)=>lib$(qtmod).so.5) \
     217     $(foreach lib,$(VBOX_QT_PLUGINS),$(qt5-bin_0_OUTDIR)/$(lib)=>$(lib))
     218     ifneq ($(KBUILD_TARGET),solaris)
     219      qt5-bin_SOURCES += \
     220       $(foreach lib,$(VBOX_QT_LEGACY_LIBS),$(qt5-bin_0_OUTDIR)/$(lib)=>legacy/$(lib))
     221     endif # solaris
    272222
    273223$(foreach qtmod,$(VBOX_QT_MOD_NAMES),$$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.$(QT5_VERSION)): \
    274         $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/% | $$(qt5-bin_0_OUTDIR)/
    275         $(call MSG_INST_FILE,$^,$@)
    276         $(QUIET)$(CP) $^ $@
    277         $(QUIET)chrpath --delete $@
    278 
    279       ifneq ($(KBUILD_TARGET),solaris)
     224       $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/% | $$(qt5-bin_0_OUTDIR)/
     225       $(call MSG_INST_FILE,$^,$@)
     226       $(QUIET)$(CP) $^ $@
     227       $(QUIET)chrpath --delete $@
     228
     229     ifneq ($(KBUILD_TARGET),solaris)
    280230$(foreach lib,$(VBOX_QT_PLUGINS),$$(qt5-bin_0_OUTDIR)/$(lib)): \
    281         $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
    282         $(call MSG_INST_FILE,$^,$@)
    283         $(QUIET)$(MKDIR) -p $(@D)
    284         $(QUIET)$(CP) $^ $@
    285         $(QUIET)chrpath --delete $@
    286       endif # !solaris
    287 
    288       # @todo For solaris dlopen fails to navigate executable rpath to dependent libraries,
    289       #       so add explicit rpath for libqxcb.so, find better solution later.
    290       ifeq ($(KBUILD_TARGET),solaris)
     231       $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
     232       $(call MSG_INST_FILE,$^,$@)
     233       $(QUIET)$(MKDIR) -p $(@D)
     234       $(QUIET)$(CP) $^ $@
     235       $(QUIET)chrpath --delete $@
     236     endif # !solaris
     237
     238     # @todo For solaris dlopen fails to navigate executable rpath to dependent libraries,
     239     #       so add explicit rpath for libqxcb.so, find better solution later.
     240     ifeq ($(KBUILD_TARGET),solaris)
    291241$(foreach lib,$(VBOX_QT_PLUGINS),$$(qt5-bin_0_OUTDIR)/$(lib)): \
    292         $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
    293         $(call MSG_INST_FILE,$^,$@)
    294         $(QUIET)$(MKDIR) -p $(@D)
    295         $(QUIET)$(CP) $^ $@
    296         $(QUIET)chrpath --replace "\$$ORIGIN/../../" $@
    297       endif # solaris
     242       $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
     243       $(call MSG_INST_FILE,$^,$@)
     244       $(QUIET)$(MKDIR) -p $(@D)
     245       $(QUIET)$(CP) $^ $@
     246       $(QUIET)chrpath --replace "\$$ORIGIN/../../" $@
     247     endif # solaris
    298248
    299249$(foreach lib,$(VBOX_QT_LEGACY_LIBS),$$(qt5-bin_0_OUTDIR)/$(lib)): \
    300         $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/legacy/% | $$(qt5-bin_0_OUTDIR)/
    301         $(call MSG_INST_FILE,$^,$@)
    302         $(QUIET)$(CP) $^ $@
    303         $(QUIET)chrpath --delete $@
    304 
    305     endif # !VBOX_WITH_HARDENING
    306    endif # x11
    307   endif # VBOX_WITH_ORACLE_QT || VBOX_WITH_QT_PAYLOAD
    308  endif # win x11
    309 endif # VBOX_WITH_QTGUI_V5
     250       $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/legacy/% | $$(qt5-bin_0_OUTDIR)/
     251       $(call MSG_INST_FILE,$^,$@)
     252       $(QUIET)$(CP) $^ $@
     253       $(QUIET)chrpath --delete $@
     254
     255   endif # !VBOX_WITH_HARDENING
     256  endif # x11
     257 endif # VBOX_WITH_ORACLE_QT || VBOX_WITH_QT_PAYLOAD
     258endif # win x11
    310259
    311260

  • trunk/configure

    r67045 r67067  
    8383WITH_LIBIDL=1
    8484WITH_GSOAP=0
    85 WITH_QT4=0
    8685WITH_QT5=1
    8786WITH_SDL=1
    … …  
    155154PKGCONFIG="`which_wrapper pkg-config`"
    156155PYTHONDIR="/usr /usr/local"
    157 QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr/lib64/qt4 /usr /usr/local"
    158 QT4DIR_PKGCONFIG=1
    159156QT5DIR="/usr/lib/qt5 /usr/share/qt5 /usr/lib64/qt5 /usr /usr/local"
    160157QT5DIR_PKGCONFIG=1
    … …  
    14671464    [ $PASSIVE_MESA -eq 1 ] && unset DISPLAY
    14681465    test_execute
    1469   fi
    1470 }
    1471 
    1472 
    1473 #
    1474 # Check for the Qt4 library, needed by the VirtualBox frontend
    1475 #
    1476 # Currently not fatal.
    1477 #
    1478 check_qt4()
    1479 {
    1480   foundqt4=
    1481   test_header Qt4
    1482   cat > $ODIR.tmp_src.cc << EOF
    1483 #include <QtGlobal>
    1484 extern "C" int main(void)
    1485 {
    1486 #if QT_VERSION >= 0x040800
    1487   return 0;
    1488 #else
    1489   return 1;
    1490 #endif
    1491 }
    1492 EOF
    1493   if [ "$OS" = "darwin" ]; then
    1494     # First check if there is the internal version of Qt. If yes nothing else
    1495     # has to be done.
    1496     QT_INTERNAL=`/bin/ls -rd1 $PWD/tools/$BUILD_TARGET.$BUILD_PLATFORM_ARCH/qt/* 2> /dev/null`
    1497     for t in $QT_INTERNAL; do
    1498       if [ -f "$t/Frameworks/QtCoreVBox.framework/QtCoreVBox" ]; then
    1499         cnf_append "VBOX_WITH_ORACLE_QT" "1"
    1500         log_success "use internal version"
    1501         return
    1502       fi
    1503     done
    1504     # Now try the user provided directory and some of the standard directories.
    1505     QT_TRIES="$QT4DIR /System/Library /Library"
    1506     for t in $QT_TRIES; do
    1507       if [ -f "$t/Frameworks/QtCore.framework/QtCore" ]; then
    1508         PATH_SDK_QT4="$t"
    1509         break
    1510       fi
    1511     done
    1512     # Add the necessary params for building the test application
    1513     if [ -n "$PATH_SDK_QT4" ]; then
    1514       foundqt4=1
    1515       INCQT4=-I$PATH_SDK_QT4/Frameworks/QtCore.framework/Headers
    1516       LIBQT4=-F$PATH_SDK_QT4/Frameworks
    1517       FLGQT4="-framework QtCore"
    1518     else
    1519       log_failure "Qt4 framework not found (can be disabled using --disable-qt)"
    1520       fail
    1521     fi
    1522   else # !darwin
    1523     if [ $QT4DIR_PKGCONFIG -eq 1 ]; then
    1524       # default is to use pkg-config
    1525       if which_wrapper pkg-config > /dev/null; then
    1526         qt4_ver=`pkg-config QtCore --modversion 2>> $LOG`
    1527         if [ $? -eq 0 ]; then
    1528           FLGQT4=`pkg-config QtCore --cflags`
    1529           INCQT4=`strip_I "$FLGQT4"`
    1530           LIBQT4=`PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 pkg-config QtCore --libs`
    1531           TOOLQT4=`pkg-config QtCore --variable=prefix`
    1532           TOOLQT4MOC="`pkg-config QtCore --variable=moc_location`"
    1533           TOOLQT4BIN="`dirname $TOOLQT4MOC`"
    1534           if test_compile "$LIBQT4 $LIBPTHREAD $FLGQT4" qt4 qt4 nofatal; then
    1535             test_execute_path "`strip_L "$LIBQT4"`" nofatal && foundqt4=3 # pkg-config
    1536           fi
    1537         fi
    1538       else
    1539         log_failure "pkg-config not found"
    1540         fail
    1541       fi
    1542     fi
    1543     if [ -z "$foundqt4" ]; then
    1544       # do it the old way (e.g. user has specified QT4DIR)
    1545       for q in $QT4DIR "$PWD/tools/linux.$TARGET_MACHINE"/qt/v4.8.*; do
    1546         INCQT4="$q/include $q/include/QtCore"
    1547         FLGQT4="-DQT_SHARED"
    1548         I_INCQT4=`prefix_I "$INCQT4"`
    1549         LIBQT4="-L$q/lib -lQtCoreVBox"
    1550         TOOLQT4="$q"
    1551         if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal &&
    1552             test_execute_path "`strip_L "$LIBQT4"`" nofatal; then
    1553           foundqt4=2 # internal
    1554           break;
    1555         fi
    1556         LIBQT4="-L$q/lib -lQtCore"
    1557         if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal &&
    1558             test_execute_path "`strip_L "$LIBQT4"`" nofatal; then
    1559           foundqt4=1 # no pkg-config, Qt directory
    1560           break;
    1561         fi
    1562       done
    1563     fi
    1564   fi
    1565   if [ -n "$foundqt4" ]; then
    1566     # we decided which version of Qt to use. Now enforce the version requirement
    1567     cat > $ODIR.tmp_src.cc << EOF
    1568 #include <cstdio>
    1569 #include <QtGlobal>
    1570 extern "C" int main(void)
    1571 {
    1572   printf("found version %s", QT_VERSION_STR);
    1573 #if QT_VERSION >= 0x040800
    1574   printf(", OK.\n");
    1575   return 0;
    1576 #else
    1577   printf(", expected version 4.8.0 or higher\n");
    1578   return 1;
    1579 #endif
    1580 }
    1581 EOF
    1582     [ -n "$INCQT4" ] && I_INCQT4=`prefix_I "$INCQT4"`
    1583     if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
    1584       if test_execute_path "`strip_L "$LIBQT4"`"; then
    1585         if [ "$OS" = "darwin" ]; then
    1586           # Successful build & run the test application so add the necessary
    1587           # params to AutoConfig.kmk
    1588           cnf_append "PATH_SDK_QT4_INC" "$PATH_SDK_QT4/Frameworks"
    1589           cnf_append "PATH_SDK_QT4_LIB" "$PATH_SDK_QT4/Frameworks"
    1590           cnf_append "PATH_SDK_QT4" "$PATH_SDK_QT4/Frameworks"
    1591           # Check for the moc tool in the Qt directory found & some standard
    1592           # directories.
    1593           for q in $PATH_SDK_QT4 /usr /Developer/Tools/Qt; do
    1594             if which_wrapper "$q/bin/moc" > /dev/null; then
    1595               cnf_append "PATH_TOOL_QT4_BIN" "$q/bin"
    1596             fi
    1597           done
    1598         else
    1599           # strip .../QtCore as we add components ourself
    1600           INCQT4=`echo "$INCQT4"|$KBUILD_SED 's|\([^ ]*\)/QtCore|\1|g; s| $||g'`
    1601           # store only the first path, remove all other pathes
    1602           # most likely pkg-config gave us -I/usr/include/qt4 -I/usr/include/qt4/QtCore
    1603           INCQT4=`echo "$INCQT4"|$KBUILD_SED 's|\([^ ]*\) .*|\1|'`
    1604           cnf_append "VBOX_PATH_QT_LIB" "`strip_L "$LIBQT4"`"
    1605           cnf_append "PATH_SDK_QT4_INC" "$INCQT4"
    1606           # this is not quite right since the qt libpath does not have to be first...
    1607           cnf_append "PATH_SDK_QT4_LIB" '$'"(firstword `strip_L "$LIBQT4"`)"
    1608           if [ "$foundqt4" = "2" ]; then
    1609             cnf_append "VBOX_WITH_ORACLE_QT" "1"
    1610           fi
    1611           if [ "$foundqt4" != "3" ]; then
    1612             TOOLQT4BIN="$TOOLQT4/bin"
    1613           fi
    1614           test_header "Qt4 devtools"
    1615           # try it with a suffix, some platforms use that
    1616           if which_wrapper "$TOOLQT4BIN/moc-qt4" > /dev/null; then
    1617             QT4BINSUFF="-qt4"
    1618           else
    1619             QT4BINSUFF=""
    1620           fi
    1621           moc_ver=`$TOOLQT4BIN/moc$QT4BINSUFF -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
    1622           if [ $? -ne 0 ]; then
    1623             log_failure "moc$QT4BINSUFF not working"
    1624             fail
    1625           else
    1626             log_success "found version $moc_ver"
    1627             cnf_append "VBOX_PATH_QT" "$TOOLQT4"
    1628             cnf_append "PATH_SDK_QT4" "$TOOLQT4"
    1629             cnf_append "PATH_TOOL_QT4_BIN" "$TOOLQT4BIN"
    1630             [ -n "$QT4BINSUFF" ] && cnf_append "TOOL_QT4_BIN_SUFF" "$QT4BINSUFF"
    1631           fi
    1632         fi
    1633       fi
    1634     else
    1635       log_failure "qt4 not working"
    1636       fail
    1637     fi
    1638   else
    1639     log_failure "qt4 not found"
    1640     fail
    16411466  fi
    16421467}
    … …  
    24962321[ $WITH_VMMRAW  -eq 1 ] && echo "  --disable-vmmraw         disable VMM raw mode (VT-x/AMD-V mandatory!)"
    24972322[ $WITH_SDL_TTF -eq 1 ] && echo "  --disable-sdl-ttf        disable SDL_ttf detection"
    2498 [ $WITH_QT4     -eq 1 ] && echo "  --disable-qt             disable Qt detection"
    24992323[ $WITH_QT5     -eq 1 ] && echo "  --disable-qt             disable Qt detection"
    25002324[ $WITH_ALSA    -eq 1 ] && echo "  --disable-alsa           disable the ALSA sound backend"
    … …  
    25032327[ $WITH_KMODS   -eq 1 ] && echo "  --disable-kmods          don't build Linux kernel modules (host and guest)"
    25042328[ $WITH_OPENGL  -eq 1 ] && echo "  --disable-opengl         disable OpenGL support (2D & 3D)"
    2505 [ $WITH_QT4     -eq 0 ] && echo "  --enable-qt4             enable Qt4 detection"
    25062329[ $WITH_QT5     -eq 0 ] && echo "  --enable-qt5             enable Qt5 detection"
    25072330[ $WITH_GSOAP   -eq 0 ] && echo "  --enable-webservice      enable the webservice stuff"
    … …  
    25382361[ "$OS"   = "darwin" ] && echo "                           only, ignored for the rest)"
    25392362[ "$OS"    = "linux" ] && echo "  --with-linux=DIR         Linux kernel source directory [$LINUX]"
    2540 [ $WITH_QT4    -eq 1 ] && echo "  --with-qt-dir=DIR        directory for Qt headers/libraries [pkgconfig]"
    25412363[ $WITH_QT5    -eq 1 ] && echo "  --with-qt-dir=DIR        directory for Qt headers/libraries [pkgconfig]"
    25422364[ $WITH_GSOAP  -eq 1 ] && echo "  --with-gsoap-dir=PATH    directory for gSOAP compiler/headers/libraries"
    … …  
    26322454      ;;
    26332455    --with-qt-dir=*)
    2634       [ $WITH_QT4 -eq 1 ] && QT4DIR=`echo $option | cut -d'=' -f2`
    2635       [ $WITH_QT4 -eq 1 ] && QT4DIR_PKGCONFIG=0
    26362456      [ $WITH_QT5 -eq 1 ] && QT5DIR=`echo $option | cut -d'=' -f2`
    26372457      [ $WITH_QT5 -eq 1 ] && QT5DIR_PKGCONFIG=0
    … …  
    26922512      ;;
    26932513    --disable-qt)
    2694       [ $WITH_QT4 -eq 1 ] && WITH_QT4=0
    2695       [ $WITH_QT5 -eq 1 ] && WITH_QT5=0
    2696       ;;
    2697     --enable-qt4)
    2698       [ $WITH_QT4 -eq 0 ] && WITH_QT4=1
    26992514      [ $WITH_QT5 -eq 1 ] && WITH_QT5=0
    27002515      ;;
    27012516    --enable-qt5)
    27022517      [ $WITH_QT5 -eq 0 ] && WITH_QT5=1
    2703       [ $WITH_QT4 -eq 1 ] && WITH_QT4=0
    27042518      ;;
    27052519    --passive-mesa)
    … …  
    27812595      WITH_X11=0
    27822596      WITH_OPENGL=0
    2783       WITH_QT4=0
    27842597      WITH_QT5=0
    27852598      ;;
    … …  
    29322745fi
    29332746[ $WITH_XPCOM     -eq 0 ] && cnf_append "VBOX_WITH_MAIN" ""
    2934 [ $WITH_QT4       -eq 0 -a $WITH_QT5       -eq 0 ] && cnf_append "VBOX_WITH_QTGUI" ""
    2935 [ $WITH_QT5       -eq 1 ] && cnf_append "VBOX_WITH_QTGUI_V5" "1"
     2747[ $WITH_QT5       -eq 0 ] && cnf_append "VBOX_WITH_QTGUI" ""
    29362748[ $WITH_SDL_TTF   -eq 0 ] && cnf_append "VBOX_WITH_SECURELABEL" ""
    29372749[ $WITH_PYTHON    -eq 0 ] && cnf_append "VBOX_WITH_PYTHON" ""
    … …  
    29852797  [ $WITH_X11    -eq 1 ] && check_xrandr
    29862798  [ $WITH_OPENGL -eq 1 ] && check_opengl
    2987   [ $WITH_QT4    -eq 1 ] && check_qt4
    29882799  [ $WITH_QT5    -eq 1 ] && check_qt5
    29892800  [ $WITH_PYTHON -eq 1 ] && check_python

  • trunk/configure.vbs

    r63334 r67067  
    20232023
    20242024''
    2025 ' Checks for any Qt4/5 binaries.
    2026 sub CheckForQt(strOptQt4, strOptQt5)
    2027    dim strPathQt4
    2028 
    2029    PrintHdr "Qt4"
    2030 
    2031    '
    2032    ' Try to find the Qt4 installation (user specified path with --with-qt4)
    2033    '
    2034    strPathQt4 = ""
    2035 
    2036    LogPrint "Checking for user specified path of Qt4 ... "
    2037    if (strPathQt4 = "") And (strOptQt4 <> "") then
    2038       strOptQt4 = UnixSlashes(strOptQt4)
    2039       if CheckForQt4Sub(strOptQt4) then strPathQt4 = strOptQt4
    2040    end if
    2041 
    2042    ' Check the dev tools
    2043    if (strPathQt4 = "") Then
    2044       strPathQt4 = g_strPathDev & "/win." & g_strTargetArch & "/qt/v4.7.3-vcc100"
    2045       if CheckForQt4Sub(strPathQt4) = False then strPathQt4 = ""
    2046    end if
    2047 
    2048    ' Display the result.
    2049    if strPathQt4 = "" then
    2050       PrintResultMsg "Qt4", "not found"
    2051    else
    2052       PrintResult "Qt4", strPathQt4
    2053    end if
     2025' Checks for any Qt5 binaries.
     2026sub CheckForQt(strOptQt5)
    20542027
    20552028   PrintHdr "Qt5"
    … …  
    20832056      CfgPrint "PATH_TOOL_QT5         := $(PATH_SDK_QT5)"
    20842057      CfgPrint "VBOX_PATH_QT          := $(PATH_SDK_QT5)"
    2085       if strPathQt4 <> "" then
    2086          MsgWarning "Have working path to both Qt4 ad Qt5, ignoring Qt4."
    2087       end if
    2088    elseif strPathQt4 <> "" then
    2089       CfgPrint "PATH_SDK_QT4          := " & strPathQt4
    2090       CfgPrint "PATH_TOOL_QT4         := $(PATH_SDK_QT4)"
    2091       CfgPrint "VBOX_PATH_QT          := $(PATH_SDK_QT4)"
    2092    end if
    2093    if (strPathQt4 = "") And (strPathQt5 = "") then
     2058   end if
     2059   if (strPathQt5 = "") then
    20942060      CfgPrint "VBOX_WITH_QTGUI       :="
    20952061   end if
    2096    if strPathQt5 = "" then
    2097       CfgPrint "VBOX_WITH_QTGUI_V5    :="
    2098    end if
    2099 end sub
    2100 
    2101 
    2102 ''
    2103 ' Checks if the specified path points to an usable Qt4 library.
    2104 function CheckForQt4Sub(strPathQt4)
    2105 
    2106    CheckForQt4Sub = False
    2107    LogPrint "trying: strPathQt4=" & strPathQt4
    2108 
    2109    if   LogFileExists(strPathQt4, "bin/moc.exe") _
    2110     And LogFileExists(strPathQt4, "bin/uic.exe") _
    2111     And LogFileExists(strPathQt4, "include/Qt/qwidget.h") _
    2112     And LogFileExists(strPathQt4, "include/QtGui/QApplication") _
    2113     And LogFileExists(strPathQt4, "include/QtNetwork/QHostAddress") _
    2114     And (   LogFileExists(strPathQt4, "lib/QtCore4.lib") _
    2115          Or LogFileExists(strPathQt4, "lib/VBoxQtCore4.lib") _
    2116          Or LogFileExists(strPathQt4, "lib/QtCoreVBox4.lib")) _
    2117     And (   LogFileExists(strPathQt4, "lib/QtNetwork4.lib") _
    2118          Or LogFileExists(strPathQt4, "lib/VBoxQtNetwork4.lib") _
    2119          Or LogFileExists(strPathQt4, "lib/QtNetworkVBox4.lib")) _
    2120       then
    2121          CheckForQt4Sub = True
    2122    end if
    2123 
    2124 end function
     2062end sub
    21252063
    21262064
    … …  
    22072145   Print "  --with-MinGW32=PATH   "
    22082146   Print "  --with-MinGW-w64=PATH "
    2209    Print "  --with-Qt4=PATH       "
    22102147   Print "  --with-Qt5=PATH       "
    22112148   Print "  --with-SDK=PATH       "
    … …  
    22442181   strOptMinGW32 = ""
    22452182   strOptMinGWw64 = ""
    2246    strOptQt4 = ""
    22472183   strOptQt5 = ""
    22482184   strOptSDK = ""
    … …  
    22872223         case "--with-mingw-w64"
    22882224            strOptMinGWw64 = strPath
    2289          case "--with-qt4"
    2290             strOptQt4 = strPath
    22912225         case "--with-qt5"
    22922226            strOptQt5 = strPath
    … …  
    23842318   CheckForSsl strOptSsl
    23852319   CheckForCurl strOptCurl
    2386    CheckForQt strOptQt4, strOptQt5
     2320   CheckForQt strOptQt5
    23872321   if (strOptPython <> "") then
    23882322     CheckForPython strOptPython

  • trunk/debian/control

    r63946 r67067  
    44Maintainer: Oracle Corporation <[email protected]>
    55Standards-Version: 3.2.1
    6 Build-Depends: debhelper (>= 5), libz-dev, libssl-dev, libqt4-dev,
    7   libqt4-opengl-dev, libsdl1.2-dev, uuid-dev, libxcursor-dev,
     6Build-Depends: debhelper (>= 5), libz-dev, libssl-dev,
     7  libsdl1.2-dev, uuid-dev, libxcursor-dev,
    88  libidl-dev, libpam0g-dev, iasl, xsltproc, linux-headers-generic,
    99  wine, java2-runtime, lsb-release, g++-multilib [amd64],

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

    r64554 r67067  
    9292if defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_DEBUGGER_GUI)
    9393#
    94 # Debugger GUI component (Qt4).
     94# Debugger GUI component (Qt).
    9595#
    96 ifndef VBOX_WITH_QTGUI_V5
    97  USES += qt4
    98 else # VBOX_WITH_QTGUI_V5
    99  USES += qt5
    100 endif # VBOX_WITH_QTGUI_V5
     96USES += qt5
    10197DLLS += VBoxDbg
    10298VBoxDbg_TEMPLATE = VBOXQTGUI
    103 VBoxDbg_DEFS = IN_DBG_R3 VBOXDBG_USE_QT4
     99VBoxDbg_DEFS = IN_DBG_R3
    104100VBoxDbg_INCS = .
    105 VBoxDbg_QT_MODULES = Core Gui
    106 ifdef VBOX_WITH_QTGUI_V5
    107  # Qt5 requires additional modules:
    108  VBoxDbg_QT_MODULES += Widgets
    109 endif # VBOX_WITH_QTGUI_V5
     101VBoxDbg_QT_MODULES = Core Gui Widgets
    110102VBoxDbg_QT_MOCHDRS = \
    111103        VBoxDbgGui.h \
    112104        VBoxDbgConsole.h \
    113         VBoxDbgStatsQt4.h
     105        VBoxDbgStatsQt.h
    114106VBoxDbg_SOURCES = \
    115107        VBoxDbg.cpp \
    … …  
    117109        VBoxDbgBase.cpp \
    118110        VBoxDbgConsole.cpp \
    119         VBoxDbgStatsQt4.cpp
     111        VBoxDbgStatsQt.cpp
    120112VBoxDbg_LIBS = \
    121113        $(VBOX_LIB_VMM_LAZY)
    … …  
    126118 ifdef VBOX_WITH_TESTCASES
    127119#
    128 # The VBoxDbg testcase (Qt4).
     120# The VBoxDbg testcase (Qt).
    129121#
    130122PROGRAMS += tstVBoxDbg
    131123tstVBoxDbg_TEMPLATE     = VBOXQTGUIEXE
    132 ifndef VBOX_WITH_QTGUI_V5
    133  tstVBoxDbg_USES         = qt4
    134  tstVBoxDbg_QTTOOL       = QT4
    135 else # VBOX_WITH_QTGUI_V5
    136  tstVBoxDbg_USES         = qt5
    137  tstVBoxDbg_QTTOOL       = QT5
    138 endif # VBOX_WITH_QTGUI_V5
    139 tstVBoxDbg_QT_MODULES   = Core Gui
    140 ifdef VBOX_WITH_QTGUI_V5
    141  # Qt5 requires additional modules:
    142  tstVBoxDbg_QT_MODULES += Widgets
    143  tstVBoxDbg_LIBS.linux   += xcb
    144  tstVBoxDbg_LIBS.solaris += xcb
    145  tstVBoxDbg_LIBS.freebsd += xcb
    146 endif # VBOX_WITH_QTGUI_V5
     124tstVBoxDbg_USES         = qt5
     125tstVBoxDbg_QTTOOL       = QT5
     126tstVBoxDbg_QT_MODULES   = Core Gui Widgets
     127tstVBoxDbg_LIBS.linux   += xcb
     128tstVBoxDbg_LIBS.solaris += xcb
     129tstVBoxDbg_LIBS.freebsd += xcb
    147130tstVBoxDbg_SOURCES      = testcase/tstVBoxDbg.cpp
    148131tstVBoxDbg_LIBS         = \
    … …  
    158141  endif
    159142 endif # TESTCASES
    160 endif # Qt4
     143endif # Qt
    161144
    162145

  • trunk/src/VBox/Debugger/VBoxDbgGui.h

    r62480 r67067  
    2626#endif
    2727
    28 #include "VBoxDbgStatsQt4.h"
     28#include "VBoxDbgStatsQt.h"
    2929#include "VBoxDbgConsole.h"
    3030

  • trunk/src/VBox/Debugger/VBoxDbgStatsQt.cpp

    r67066 r67067  
    2121*********************************************************************************************************************************/
    2222#define LOG_GROUP LOG_GROUP_DBGG
    23 #include "VBoxDbgStatsQt4.h"
     23#include "VBoxDbgStatsQt.h"
    2424
    2525#include <QLocale>

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

    r67060 r67067  
    9292# VirtualBox - The GUI program.
    9393#
    94 ifndef VBOX_WITH_QTGUI_V5
    95  USES += qt4
    96 else # VBOX_WITH_QTGUI_V5
    97  USES += qt5
    98 endif # VBOX_WITH_QTGUI_V5
     94USES += qt5
    9995VirtualBox_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQTGUI,VBOXQTGUIEXE)
    10096VirtualBox_NAME = VirtualBox
    … …  
    227223VirtualBox_LIBS.freebsd += Xinerama
    228224
    229 ifdef VBOX_WITH_QTGUI_V5
    230  # No Qt5 without Xcb under X11:
    231  VirtualBox_LIBS.linux   += xcb
    232  VirtualBox_LIBS.solaris += xcb
    233  VirtualBox_LIBS.freebsd += xcb
    234 endif # VBOX_WITH_QTGUI_V5
     225VirtualBox_LIBS.linux   += xcb
     226VirtualBox_LIBS.solaris += xcb
     227VirtualBox_LIBS.freebsd += xcb
    235228
    236229ifneq ($(KBUILD_TARGET),win)
    … …  
    852845        src/platform/win/WinKeyboard.cpp
    853846
    854 if defined(VBOX_WITH_QTGUI_V5) && (defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD))
     847if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
    855848 INSTALLS.linux += VirtualBox.qt.conf
    856849 INSTALLS.solaris += VirtualBox.qt.conf
    … …  
    906899
    907900# The Qt modules we're using.
    908 # (The include directory and lib/framework for each module will be added by the Qt4 unit.)
    909 VirtualBox_QT_MODULES = Core Gui
    910 ifdef VBOX_WITH_QTGUI_V5
    911  # Qt5 requires additional modules:
    912  VirtualBox_QT_MODULES += Widgets PrintSupport
    913  VirtualBox_QT_MODULES.linux   += X11Extras
    914  VirtualBox_QT_MODULES.solaris += X11Extras
    915  VirtualBox_QT_MODULES.freebsd += X11Extras
    916  VirtualBox_QT_MODULES.darwin  += MacExtras
    917  VirtualBox_QT_MODULES.win     += WinExtras
    918 endif # VBOX_WITH_QTGUI_V5
     901# (The include directory and lib/framework for each module will be added by the Qt unit.)
     902VirtualBox_QT_MODULES = Core Gui Widgets PrintSupport
     903VirtualBox_QT_MODULES.linux   += X11Extras
     904VirtualBox_QT_MODULES.solaris += X11Extras
     905VirtualBox_QT_MODULES.freebsd += X11Extras
     906VirtualBox_QT_MODULES.darwin  += MacExtras
     907VirtualBox_QT_MODULES.win     += WinExtras
    919908if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    920909 VirtualBox_QT_MODULES += OpenGL
    … …  
    11211110        $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-hdd.icns=>Resources/virtualbox-hdd.icns
    11221111
    1123  ifdef VBOX_WITH_QTGUI_V5
    11241112 # Qt5 requires qt.conf on Mac OS X:
    11251113 VirtualBox.app_SOURCES += \
    11261114        $(VirtualBox.app_0_OUTDIR)/qt.conf=>Resources/qt.conf
    1127  endif # VBOX_WITH_QTGUI_V5
    11281115
    11291116 $$(VirtualBox.app_0_OUTDIR)/Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/Info.plist $(VBOX_VERSION_MK) | $$(@D)/
    … …  
    12441231 PROGRAMS += tstSSLCertDownloads
    12451232 tstSSLCertDownloads_TEMPLATE   = VBOXQTGUIEXE
    1246  ifndef VBOX_WITH_QTGUI_V5
    1247   tstSSLCertDownloads_USES       = qt4
    1248   tstSSLCertDownloads_QTTOOL     = QT4
    1249  else # VBOX_WITH_QTGUI_V5
    1250   tstSSLCertDownloads_USES       = qt5
    1251   tstSSLCertDownloads_QTTOOL     = QT5
    1252  endif # VBOX_WITH_QTGUI_V5
     1233 tstSSLCertDownloads_USES       = qt5
     1234 tstSSLCertDownloads_QTTOOL     = QT5
    12531235 tstSSLCertDownloads_QT_MODULES = Core Gui
    12541236 tstSSLCertDownloads_DEFS = VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS
    … …  
    13831365                $(filter-out %.qrc,$(VirtualBox_SOURCES) $(VirtualBox_VBOX_EXTRA_NLS_SOURCES))
    13841366        $(call MSG_L1,lupdate all languages (nls/*.ts))
    1385         $(QUIET)$(if $(VBOX_WITH_QTGUI_V5),$(TOOL_QT5_LUPDATE),$(TOOL_QT4_LUPDATE)) \
     1367        $(QUIET)$(TOOL_QT5_LUPDATE) \
    13861368                $^ \
    13871369                -ts \
    … …  
    13951377                $(filter-out %.qrc,$(VirtualBox_SOURCES) $(VirtualBox_VBOX_EXTRA_NLS_SOURCES))
    13961378        $(call MSG_L1,lupdate $@)
    1397         $(QUIET)$(if $(VBOX_WITH_QTGUI_V5),$(TOOL_QT5_LUPDATE),$(TOOL_QT4_LUPDATE)) \
     1379        $(QUIET)$(TOOL_QT5_LUPDATE) \
    13981380                $^ \
    13991381                -ts \

  • trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.ui

    r62495 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.ui

    r62495 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.ui

    r62495 r67067  
    11<ui version="4.0" >
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.ui

    r62495 r67067  
    11<ui version="4.0" >
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.ui

    r62495 r67067  
    11<ui version="4.0" >
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.ui

    r62495 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2012-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.ui

    r64305 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2010-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.ui

    r62495 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.ui

    r62495 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.ui

    r62495 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.ui

    r66761 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2009-2017 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.ui

    r62495 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2009-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.ui

    r62495 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2011-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.ui

    r62495 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.ui

    r62495 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.ui

    r62495 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.ui

    r62495 r67067  
    11<ui version="4.0" >
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.ui

    r62495 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.ui

    r62495 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.ui

    r62495 r67067  
    11<ui version="4.0" >
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.ui

    r66370 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.ui

    r62495 r67067  
    11<ui version="4.0" >
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.ui

    r62495 r67067  
    11<ui version="4.0" >
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.ui

    r66370 r67067  
    11<ui version="4.0" >
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2009-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.ui

    r62495 r67067  
    11<ui version="4.0">
    22 <comment>
    3  VBox frontends: Qt4 GUI (&quot;VirtualBox&quot;):
     3 VBox frontends: Qt GUI (&quot;VirtualBox&quot;):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.ui

    r64358 r67067  
    11<ui version="4.0" >
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.ui

    r62495 r67067  
    11<ui version="4.0" >
    22 <comment>
    3  VBox frontends: Qt4 GUI ("VirtualBox"):
     3 VBox frontends: Qt GUI ("VirtualBox"):
    44
    55 Copyright (C) 2008-2016 Oracle Corporation

  • trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

    r66393 r67067  
    420420 ifneq ($(KBUILD_TARGET),darwin)
    421421  ifdef VBOX_WITH_VIDEOHWACCEL
    422    ifndef VBOX_WITH_QTGUI_V5
    423     USES += qt4
    424    else # VBOX_WITH_QTGUI_V5
    425     USES += qt5
    426    endif # VBOX_WITH_QTGUI_V5
     422   USES += qt5
    427423  endif
    428424  PROGRAMS += VBoxTestOGL
    … …  
    441437    $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,)
    442438  ifdef VBOX_WITH_VIDEOHWACCEL
    443    VBoxTestOGL_QT_MODULES     += Core Gui OpenGL
    444    ifdef VBOX_WITH_QTGUI_V5
    445     # Qt5 requires additional modules:
    446     VBoxTestOGL_QT_MODULES += Widgets
    447     VBoxTestOGL_LIBS.linux   += xcb
    448     VBoxTestOGL_LIBS.solaris += xcb
    449     VBoxTestOGL_LIBS.freebsd += xcb
    450    endif # VBOX_WITH_QTGUI_V5
     439   VBoxTestOGL_QT_MODULES   += Core Gui OpenGL Widgets
     440   VBoxTestOGL_LIBS.linux   += xcb
     441   VBoxTestOGL_LIBS.solaris += xcb
     442   VBoxTestOGL_LIBS.freebsd += xcb
    451443   VBoxTestOGL_LDFLAGS.darwin += -framework OpenGL
    452444   VBoxTestOGL_LIBS.win       += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib

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

    r64527 r67067  
    3737VBOX_PATH_DIST_OTHER = $(error VBOX_PATH_DIST_OTHER used in a non-combined package deal)
    3838
    39 ifndef VBOX_WITH_QTGUI_V5
    40  VBOX_QT_VERSION_MAJOR = 4
    41  PATH_SDK_QT = $(PATH_SDK_QT4)
    42 else # VBOX_WITH_QTGUI_V5
    43  VBOX_QT_VERSION_MAJOR = 5
    44  PATH_SDK_QT = $(PATH_SDK_QT5)
    45 endif # VBOX_WITH_QTGUI_V5
     39VBOX_QT_VERSION_MAJOR = 5
     40PATH_SDK_QT = $(PATH_SDK_QT5)
    4641
    4742# Unset this to speed up things during makefile hacking.
    … …  
    520515        MacOS/VBoxEFI64.fd
    521516endif
    522 ifndef VBOX_WITH_QTGUI_V5
    523  VBOX_DI_VBAPP_MISC_FILES += \
    524         Frameworks/QtGui$(VBOX_QT_INFIX).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/Resources/qt_menu.nib/classes.nib \
    525         Frameworks/QtGui$(VBOX_QT_INFIX).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/Resources/qt_menu.nib/info.nib \
    526         Frameworks/QtGui$(VBOX_QT_INFIX).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/Resources/qt_menu.nib/keyedobjects.nib
    527 else
    528517 VBOX_DI_VBAPP_DYLIBS += \
    529518        plugins/platforms/libqcocoa$(SUFF_DLL) \
    530519        plugins/platforms/libqminimal$(SUFF_DLL) \
    531520        plugins/platforms/libqoffscreen$(SUFF_DLL)
    532 endif # VBOX_WITH_QTGUI_V5
    533521VBOX_DI_VBAPP_MISC_FILES += \
    534522        $(foreach qtmod, $(VBOX_QT_MOD_NAMES), Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/Resources/Info.plist)

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

    r62487 r67067  
    145145        $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
    146146
    147 # Qt4 GUI
     147# Qt GUI
    148148ifdef VBOX_WITH_QTGUI
    149149 include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk

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

    r66049 r67067  
    270270        $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm) \
    271271        icons
    272  ifndef VBOX_WITH_QTGUI_V5
    273   VBOX_LNX_NO_STRIP += \
    274         $(if $(VBOX_WITH_ORACLE_QT),accessible/libqtaccessiblewidgets.so,)
    275  else # VBOX_WITH_QTGUI_V5
    276   VBOX_LNX_NO_STRIP += \
     272 VBOX_LNX_NO_STRIP += \
    277273        $(if $(VBOX_WITH_ORACLE_QT),$(VBOX_QT_PLUGINS)) \
    278274        $(addprefix legacy/,$(VBOX_QT_LEGACY_LIBS))
    279  endif # VBOX_WITH_QTGUI_V5
    280275endif
    281276
    … …  
    522517        archive/nls \
    523518        $(if $(VBOX_WITH_UNATTENDED),archive/unattended_templates,) \
    524         $(if $(VBOX_WITH_ORACLE_QT),$(if $(VBOX_WITH_QTGUI_V5),,\
    525           archive/accessible),) \
    526         $(if $(VBOX_WITH_QTGUI_V5),\
     519        $(if $(VBOX_WITH_ORACLE_QT), \
    527520          archive/plugins/platforms \
    528521          archive/legacy,) \

  • trunk/src/VBox/Installer/linux/debian/control

    r65949 r67067  
    44Maintainer: Oracle Corporation <[email protected]>
    55Standards-Version: 3.2.1
    6 Build-Depends: debhelper (>= 5), libz-dev, libssl-dev, libqt4-dev,
    7   libqt4-opengl-dev, libsdl1.2-dev, uuid-dev, libxcursor-dev,
     6Build-Depends: debhelper (>= 5), libz-dev, libssl-dev,
     7  libsdl1.2-dev, uuid-dev, libxcursor-dev,
    88  libidl-dev, libpam0g-dev, iasl, xsltproc, linux-headers-generic,
    99  wine, java2-runtime, lsb-release, g++-multilib [amd64],

  • trunk/src/VBox/Installer/linux/debian/rules

    r66822 r67067  
    9595endif
    9696
    97 # Depend on Qt 5.6 or later otherwise we use Qt 5.3.2 from Debian 8.
    9897cfg_flags := $(if $(NOQT),--disable-qt,) \
    99              $(if $(NOQT),,--with-qt5-major=5 --with-qt5-minor=6) \
    10098             $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
    10199             $(if $(HEADLESS),--build-headless,) \

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

    r64422 r67067  
    345345
    346346ifdef VBOX_WITH_QTGUI
    347  ifdef VBOX_WITH_QTGUI_V5
    348347  ifdef VBOX_WITH_ORACLE_QT
    349348   SOLARIS_STRIP_BINS += \
    … …  
    358357          $(if $(VBOX_GUI_USE_QGL),libQt5OpenGLVBox.so.5,)
    359358  endif
    360  else # VBOX_WITH_QTGUI_V5
    361   ifdef VBOX_WITH_ORACLE_QT
    362    SOLARIS_STRIP_BINS += \
    363           libQtCoreVBox.so.4 \
    364           libQtGuiVBox.so.4 \
    365           $(if $(VBOX_GUI_USE_QGL),libQtOpenGLVBox.so.4,) \
    366           accessible/libqtaccessiblewidgets.so
    367   endif # VBOX_WITH_ORACLE_QT
    368  endif # !VBOX_WITH_QTGUI_V5
    369359endif #VBOX_WITH_QTGUI
    370360
    … …  
    435425
    436426
    437 ## @def SOLARIS_QTLIBS
    438 # List of Qt shared libs that we need to copy from $(VBOX_PATH_QT)/lib/ to /opt/VirtualBox/$(VBOX_SI_ARCH)/
    439 # so that we can run VBoxQtConfig.
    440 ifndef VBOX_WITH_QTGUI_V5
    441  SOLARIS_FILE_LIST_VARS += SOLARIS_QTLIBS
    442  SOLARIS_QTLIBS.SUBDIRS := no
    443  SOLARIS_QTLIBS.STRIP   := no
    444  SOLARIS_QTLIBS.MODE    := 0644
    445  SOLARIS_QTLIBS.SRC     := $(VBOX_PATH_QT)/lib
    446  SOLARIS_QTLIBS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)
    447  SOLARIS_QTLIBS =
    448  ifdef VBOX_WITH_QTGUI
    449   ifdef VBOX_WITH_ORACLE_QT
    450     SOLARIS_QTLIBS += \
    451           libQtXmlVBox.so.4 \
    452           libQtSqlVBox.so.4 \
    453           libQt3SupportVBox.so.4
    454     SOLARIS_USRBIN_LINKS += \
    455           VBoxQtconfig
    456   endif
    457 
    458  include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
    459  SOLARIS_COMMON += $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm)
    460  endif
    461 endif
    462 
    463427# Documentation (packed as DOCS as they are arch. neutral)
    464428ifdef VBOX_WITH_DOCS_PACKING
    … …  
    574538                $(VBOX_PATH_SOL_INST_SRC)/vbox.pkginfo \
    575539                \
    576                 $(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_ORACLE_QT) && !defined(VBOX_WITH_QTGUI_V5),$(VBOX_PATH_QT)/bin/qtconfig,) \
    577540                $(if-expr defined(VBOX_WITH_ADDITIONS_PACKING),$(PATH_STAGE_BIN)/additions/VBoxGuestAdditions.iso,) \
    578541                $(if-expr !defined(VBOX_OSE) && defined(VBOX_WITH_VBOXSDL), $(PATH_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2,) \
    … …  
    646609
    647610# VirtualBox: Arch specific files.
    648         $(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_ORACLE_QT) && !defined(VBOX_WITH_QTGUI_V5)\
    649         ,$(INSTALL) -m 0755 \
    650                 $(VBOX_PATH_QT)/bin/qtconfig    $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/VBoxQtconfig,)
    651 
    652611        $(if-expr defined(VBOX_WITH_QTGUI) \
    653612        ,$(NLTAB)$(LN_SYMLINK) ../rdesktop-vrdp-keymaps/ $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/rdesktop-vrdp-keymaps,)

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

    r66279 r67067  
    574574                -E 'VBOX_WITH_PYTHON=$(if $(VBOX_WITH_PYTHON),yes,no)' \
    575575                -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
    576                 -E 'VBOX_WITH_QTGUI_V5=$(if $(VBOX_WITH_QTGUI_V5),yes,no)' \
    577576                -E 'VBOX_WITH_SECURELABEL=$(if $(VBOX_WITH_SECURELABEL),yes,no)' \
    578577                -E 'VBOX_WITH_SERIALNUMBER_INSTALL=$(if $(VBOX_WITH_SERIALNUMBER_INSTALL),yes,no)' \
    … …  
    666665                -E 'VBOX_WITH_PYTHON=$(if $(VBOX_WITH_PYTHON),yes,no)' \
    667666                -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
    668                 -E 'VBOX_WITH_QTGUI_V5=$(if $(VBOX_WITH_QTGUI_V5),yes,no)' \
    669667                -E 'VBOX_WITH_SECURELABEL=$(if $(VBOX_WITH_SECURELABEL),yes,no)' \
    670668                -E 'VBOX_WITH_SERIALNUMBER_INSTALL=$(if $(VBOX_WITH_SERIALNUMBER_INSTALL),yes,no)' \

  • trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

    r66279 r67067  
    304304        </File>
    305305    <?endif ?>
    306     <?if $(env.VBOX_WITH_QTGUI_V5) = "no" ?>
    307         <File Id="file_QtCore$(var.VBOX_QT_INFIX)4.dll" Name="QtCore$(var.VBOX_QT_INFIX)4.dll"
    308               Source="$(env.PATH_OUT)\bin\QtCore$(var.VBOX_QT_INFIX)4.dll" />
    309         <File Id="file_QtGui$(var.VBOX_QT_INFIX)4.dll" Name="QtGui$(var.VBOX_QT_INFIX)4.dll"
    310               Source="$(env.PATH_OUT)\bin\QtGui$(var.VBOX_QT_INFIX)4.dll" />
    311     <?else ?>
    312306        <File Id="file_Qt5Core$(var.VBOX_QT_INFIX).dll" Name="Qt5Core$(var.VBOX_QT_INFIX).dll"
    313307              Source="$(env.PATH_OUT)\bin\Qt5Core$(var.VBOX_QT_INFIX).dll" />
    … …  
    320314        <File Id="file_Qt5WinExtras$(var.VBOX_QT_INFIX).dll" Name="Qt5WinExtras$(var.VBOX_QT_INFIX).dll"
    321315              Source="$(env.PATH_OUT)\bin\Qt5WinExtras$(var.VBOX_QT_INFIX).dll" />
    322     <?endif ?>
    323316<?endif ?>
    324317<?if $(env.VBOX_WITH_DEBUGGER_GUI) = "yes" ?>
    … …  
    329322<?endif ?>
    330323<?if $(env.VBOX_GUI_USE_QGL) = "yes" ?>
    331     <?if $(env.VBOX_WITH_QTGUI_V5) = "no" ?>
    332         <File Id="file_QtOpenGL$(var.VBOX_QT_INFIX)4.dll" Name="QtOpenGL$(var.VBOX_QT_INFIX)4.dll"
    333               Source="$(env.PATH_OUT)\bin\QtOpenGL$(var.VBOX_QT_INFIX)4.dll" />
    334     <?else ?>
    335324        <File Id="file_Qt5OpenGL$(var.VBOX_QT_INFIX).dll" Name="Qt5OpenGL$(var.VBOX_QT_INFIX).dll"
    336325              Source="$(env.PATH_OUT)\bin\Qt5OpenGL$(var.VBOX_QT_INFIX).dll" />
    337     <?endif ?>
    338326<?endif?>
    339327
    … …  
    377365
    378366<?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
    379     <?if $(env.VBOX_WITH_QTGUI_V5) = "no" ?>
    380         <!-- Qt accessible plugins -->
    381         <Directory Id="dir_VBoxAppAccessible" Name="accessible">
    382             <Component Id="cp_QtAccessible" Guid="12040EF9-D4A8-4FB2-A69C-CA2F5C354A45" Win64="$(var.Property_Win64)">
    383                 <File Id="file_qtaccessiblewidgets4.dll" Name="qtaccessiblewidgets4.dll"
    384                       Source="$(env.PATH_OUT)\bin\accessible\qtaccessiblewidgets4.dll" />
    385             </Component>
    386         </Directory>
    387     <?else ?>
    388367        <!-- Qt platforms plugins -->
    389368        <Directory Id="dir_VBoxAppPlatforms" Name="platforms">
    … …  
    397376            </Component>
    398377        </Directory>
    399     <?endif?>
    400  <?endif ?>
     378<?endif ?>
    401379
    402380<?if $(env.VBOX_WITH_CROGL) = "yes" ?>

  • trunk/src/VBox/Installer/win/VirtualBox.wxs

    r66963 r67067  
    439439        <ComponentRef Id="cp_MainBinaries" />
    440440    <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
    441         <?if $(env.VBOX_WITH_QTGUI_V5) = "no" ?>
    442             <ComponentRef Id="cp_QtAccessible" />
    443         <?else ?>
    444             <ComponentRef Id="cp_QtPlatforms" />
    445         <?endif?>
     441        <ComponentRef Id="cp_QtPlatforms" />
    446442    <?endif ?>
    447443    <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>

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

    r66832 r67067  
    11181118ifeq ($(KBUILD_TARGET).$(VBOX_VCC_CRT_TYPE),win.d)
    11191119 LIBRARIES += VBoxCOM-GUI
    1120  ifndef VBOX_WITH_QTGUI_V5
    1121   USES += qt4
    1122  else # VBOX_WITH_QTGUI_V5
    1123   USES += qt5
    1124  endif # VBOX_WITH_QTGUI_V5
     1120 USES += qt5
    11251121 VBoxCOM-GUI_TEMPLATE = VBOXQTGUI$(if-expr defined(VBOX_WITH_HARDENING),,EXE)
    11261122 VBoxCOM-GUI_EXTENDS  = VBoxCOM

  • trunk/src/VBox/VMM/VMMR3/STAM.cpp

    r66683 r67067  
    13331333    /*
    13341334     * Check that the name doesn't screw up sorting order when taking
    1335      * slashes into account. The QT4 GUI makes some assumptions.
     1335     * slashes into account. The QT GUI makes some assumptions.
    13361336     * Problematic chars are: !"#$%&'()*+,-.
    13371337     */
Note: See TracChangeset for help on using the changeset viewer.

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