VirtualBox

Changeset 59509 in vbox


Ignore:
Timestamp:
Jan 28, 2016 1:45:12 PM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
105287
Message:

FE/Qt: Qt5 migration (part 79): Preparing Qt5 tool: Patching Makefiles to be able to build components with Qt5 using VBOX_WITH_QTGUI_V5 flag.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r59502 r59509  
    917917 VBOX_WITH_VALIDATIONKIT=
    918918 VBOX_WITH_TESTCASES=
    919  VBOX_WITH_MAIN =
    920  VBOX_WITH_VBOXSDL =
    921  VBOX_WITH_QTGUI =
    922  VBOX_WITH_DEBUGGER_GUI =
    923  VBOX_WITH_DOCS =
     919 VBOX_WITH_MAIN=
     920 VBOX_WITH_VBOXSDL=
     921 VBOX_WITH_QTGUI=
     922 VBOX_WITH_DEBUGGER_GUI=
     923 VBOX_WITH_DOCS=
    924924endif # VBOX_QUICK
    925925
    … …  
    51965196
    51975197#
    5198 # Qt 4
    5199 # Qt 4
    5200 # Qt 4
     5198# Qt
     5199# Qt
     5200# Qt
    52015201#
    52025202ifdef VBOX_WITH_QTGUI
    … …  
    52125212
    52135213 #
    5214  # Handmade configuration of qt4 - very annoying, this needs to
     5214 # Handmade configuration of Qt - very annoying, this needs to
    52155215 # be cleaned up properly later some time (not important now).
    52165216 #
    52175217 ifeq ($(VBOX_PATH_QT),)
    52185218  ifeq ($(KBUILD_TARGET),darwin)
    5219    VBOX_PATH_QT := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*)))
     5219   ifeq ($(VBOX_WITH_QTGUI_V5),)
     5220    VBOX_PATH_QT := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*)))
     5221   else
     5222    VBOX_PATH_QT := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
     5223   endif
    52205224   ifeq ($(VBOX_PATH_QT),)
    52215225    ifneq ($(wildcard /Library/Frameworks/QtCore.framework),)
    … …  
    52265230   endif
    52275231  else if1of ($(KBUILD_TARGET), win)
    5228    VBOX_PATH_QT ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*))))
     5232   ifeq ($(VBOX_WITH_QTGUI_V5),)
     5233    VBOX_PATH_QT ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*))))
     5234   else
     5235    VBOX_PATH_QT ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*))))
     5236   endif
    52295237  else if1of ($(KBUILD_TARGET), linux solaris)
    5230    VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*)))
     5238   ifeq ($(VBOX_WITH_QTGUI_V5),)
     5239    VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*)))
     5240   else
     5241    VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
     5242   endif
    52315243   ifneq ($(VBOX_PATH_QT),)
    52325244    VBOX_WITH_ORACLE_QT = 1
    … …  
    52385250   # gentoo (64-bit)
    52395251   VBOX_PATH_QT          ?= /usr
    5240    VBOX_PATH_QT_LIB      ?= /usr/lib/qt4
     5252   ifeq ($(VBOX_WITH_QTGUI_V5),)
     5253    VBOX_PATH_QT_LIB      ?= /usr/lib/qt4
     5254   else
     5255    VBOX_PATH_QT_LIB      ?= /usr/lib/qt5
     5256   endif
    52415257  endif
    52425258 endif
    … …  
    52485264 endif
    52495265
    5250  VBOX_QT_MOD = QtCore QtGui $(if $(VBOX_GUI_USE_QGL),QtOpenGL,)
     5266 ifeq ($(VBOX_WITH_QTGUI_V5),)
     5267  VBOX_QT_MOD = QtCore QtGui $(if $(VBOX_GUI_USE_QGL),QtOpenGL,)
     5268 else
     5269  ifeq ($(KBUILD_TARGET), darwin)
     5270   VBOX_QT_MOD = \
     5271    QtCore \
     5272    QtGui \
     5273    QtWidgets \
     5274    QtPrintSupport \
     5275    QtMacExtras \
     5276    $(if $(VBOX_GUI_USE_QGL),QtOpenGL,)
     5277  else if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris win)
     5278   VBOX_QT_MOD += \
     5279    Qt5Core \
     5280    Qt5Gui \
     5281    Qt5Widgets \
     5282    Qt5PrintSupport \
     5283    $(if $(VBOX_GUI_USE_QGL),Qt5OpenGL,)
     5284    if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris)
     5285     VBOX_QT_MOD += \
     5286      Qt5DBus \
     5287      Qt5XcbQpa \
     5288      Qt5X11Extras
     5289    endif
     5290    ifeq ($(KBUILD_TARGET), win)
     5291     VBOX_QT_MOD += \
     5292      Qt5WinExtras
     5293    endif
     5294  endif
     5295 endif
     5296
    52515297 VBOX_QT_MOD_NAMES = $(foreach qtmod,$(VBOX_QT_MOD),$(qtmod)$(VBOX_QT_INFIX))
    52525298
    … …  
    52635309 #
    52645310 TEMPLATE_VBOXQTGUIEXE = VBox Qt GUI Executable
    5265  TEMPLATE_VBOXQTGUIEXE_USES = qt4
    5266  TEMPLATE_VBOXQTGUIEXE_QTTOOL = QT4
    5267  TEMPLATE_VBOXQTGUIEXE_MOCTOOL = QT4
    5268  TEMPLATE_VBOXQTGUIEXE_UICTOOL = QT4
    5269  TEMPLATE_VBOXQTGUIEXE_RCCTOOL = QT4
    5270  TEMPLATE_VBOXQTGUIEXE_LRCTOOL = QT4
    5271  TEMPLATE_VBOXQTGUIEXE_SDKS = QT4
     5311 ifeq ($(VBOX_WITH_QTGUI_V5),)
     5312  TEMPLATE_VBOXQTGUIEXE_USES = qt4
     5313  TEMPLATE_VBOXQTGUIEXE_QTTOOL = QT4
     5314  TEMPLATE_VBOXQTGUIEXE_MOCTOOL = QT4
     5315  TEMPLATE_VBOXQTGUIEXE_UICTOOL = QT4
     5316  TEMPLATE_VBOXQTGUIEXE_RCCTOOL = QT4
     5317  TEMPLATE_VBOXQTGUIEXE_LRCTOOL = QT4
     5318  TEMPLATE_VBOXQTGUIEXE_SDKS = QT4
     5319 else
     5320  TEMPLATE_VBOXQTGUIEXE_USES = qt5
     5321  TEMPLATE_VBOXQTGUIEXE_QTTOOL = QT5
     5322  TEMPLATE_VBOXQTGUIEXE_MOCTOOL = QT5
     5323  TEMPLATE_VBOXQTGUIEXE_UICTOOL = QT5
     5324  TEMPLATE_VBOXQTGUIEXE_RCCTOOL = QT5
     5325  TEMPLATE_VBOXQTGUIEXE_LRCTOOL = QT5
     5326  TEMPLATE_VBOXQTGUIEXE_SDKS = QT5
     5327 endif
    52725328 TEMPLATE_VBOXQTGUIEXE_QT_INFIX = $(VBOX_QT_INFIX)
    52735329 TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS)

  • trunk/Makefile.kmk

    r59508 r59509  
    148148#       the Info.plist file goes into Resources.
    149149#
    150 ifeq ($(KBUILD_TARGET),darwin)
    151  include $(KBUILD_PATH)/units/qt4.kmk
    152  INSTALLS += qt4-bin
    153  qt4-bin_MODE = 755
    154  qt4-bin_INST = $(INST_VIRTUALBOX)Contents/
    155  qt4-bin_SOURCES = $(foreach qtmod,$(VBOX_QT_MOD_NAMES) \
    156         ,$(PATH_SDK_QT4_LIB)/$(qtmod).framework/Versions/4/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
    157          $(PATH_SDK_QT4_LIB)/$(qtmod).framework/Contents/Info.plist=>Frameworks/$(qtmod).framework/Versions/4/Resources/Info.plist \
    158        )
    159  ifdef VBOX_WITH_COCOA_QT
    160   qt4-bin_SOURCES += \
    161         $(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 \
    162         $(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 \
    163         $(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
     150ifeq ($(VBOX_WITH_QTGUI_V5),)
     151 ifeq ($(KBUILD_TARGET),darwin)
     152  include $(KBUILD_PATH)/units/qt4.kmk
     153  INSTALLS += qt4-bin
     154  qt4-bin_MODE = 755
     155  qt4-bin_INST = $(INST_VIRTUALBOX)Contents/
     156  qt4-bin_SOURCES = $(foreach qtmod,$(VBOX_QT_MOD_NAMES) \
     157   ,$(PATH_SDK_QT4_LIB)/$(qtmod).framework/Versions/4/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
     158    $(PATH_SDK_QT4_LIB)/$(qtmod).framework/Contents/Info.plist=>Frameworks/$(qtmod).framework/Versions/4/Resources/Info.plist \
     159      )
     160  ifdef VBOX_WITH_COCOA_QT
     161   qt4-bin_SOURCES += \
     162    $(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 \
     163    $(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 \
     164    $(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
     165  endif
     166  ifneq ($(wildcard $(VBOX_PATH_QT)/plugins/accessible/libqtaccessiblewidgets.dylib),)
     167   qt4-bin_SOURCES += \
     168    $(VBOX_PATH_QT)/plugins/accessible/libqtaccessiblewidgets.dylib=>MacOS/accessible/libqtaccessiblewidgets.dylib
     169  endif
     170  qt4-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT_MOD_NAMES) \
     171   ,Frameworks/$(qtmod).framework/Versions/Current=>4 \
     172    Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod) \
     173    Frameworks/$(qtmod).framework/Resources=>Versions/4/Resources)
     174 else
     175  if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
     176   include $(KBUILD_PATH)/units/qt4.kmk
     177   ifeq ($(KBUILD_TARGET),win)
     178    INSTALLS += qt4-bin
     179    qt4-bin_MODE = 755
     180    qt4-bin_INST = $(INST_BIN)
     181    qt4-bin_SOURCES = \
     182     $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(call VBOX_RE_SIGN_DLL_FN,qt4-bin,$(VBOX_PATH_QT_LIB)/$(qtmod)4$(SUFF_DLL))) \
     183     $(call VBOX_RE_SIGN_DLL_FN,qt4-bin,$(VBOX_PATH_QT)/plugins/accessible/qtaccessiblewidgets4$(SUFF_DLL))=>accessible/qtaccessiblewidgets4$(SUFF_DLL)
     184    ifdef VBOX_WITH_QT_PDBS
     185     qt4-bin_SOURCES += \
     186      $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(VBOX_PATH_QT_LIB)/$(qtmod)4.pdb) \
     187      $(VBOX_PATH_QT)/plugins/accessible/qtaccessiblewidgets4.pdb=>accessible/qtaccessiblewidgets4.pdb
     188    endif
     189   else
     190    INSTALLS += qt4-bin
     191    qt4-bin_MODE = 755
     192    qt4-bin_INST = $(INST_BIN)
     193    qt4-bin_SOURCES = \
     194     $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(VBOX_PATH_QT_LIB)/lib$(qtmod)$(SUFF_DLL).4) \
     195     $(VBOX_PATH_QT)/plugins/accessible/libqtaccessiblewidgets$(SUFF_DLL)=>accessible/libqtaccessiblewidgets$(SUFF_DLL)
     196   endif
     197  endif # VBOX_WITH_ORACLE_QT
    164198 endif
    165  ifneq ($(wildcard $(VBOX_PATH_QT)/plugins/accessible/libqtaccessiblewidgets.dylib),)
    166   qt4-bin_SOURCES += \
    167         $(VBOX_PATH_QT)/plugins/accessible/libqtaccessiblewidgets.dylib=>MacOS/accessible/libqtaccessiblewidgets.dylib
    168  endif
    169  qt4-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT_MOD_NAMES) \
    170                 ,Frameworks/$(qtmod).framework/Versions/Current=>4 \
    171                  Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod) \
    172                  Frameworks/$(qtmod).framework/Resources=>Versions/4/Resources)
    173 else
    174  if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
    175   include $(KBUILD_PATH)/units/qt4.kmk
    176   ifeq ($(KBUILD_TARGET),win)
    177    INSTALLS += qt4-bin
    178    qt4-bin_MODE = 755
    179    qt4-bin_INST = $(INST_BIN)
    180    qt4-bin_SOURCES = \
    181         $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(call VBOX_RE_SIGN_DLL_FN,qt4-bin,$(VBOX_PATH_QT_LIB)/$(qtmod)4$(SUFF_DLL))) \
    182         $(call VBOX_RE_SIGN_DLL_FN,qt4-bin,$(VBOX_PATH_QT)/plugins/accessible/qtaccessiblewidgets4$(SUFF_DLL))=>accessible/qtaccessiblewidgets4$(SUFF_DLL)
    183    ifdef VBOX_WITH_QT_PDBS
    184     qt4-bin_SOURCES += \
    185         $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(VBOX_PATH_QT_LIB)/$(qtmod)4.pdb) \
    186         $(VBOX_PATH_QT)/plugins/accessible/qtaccessiblewidgets4.pdb=>accessible/qtaccessiblewidgets4.pdb
    187    endif
    188   else
    189    INSTALLS += qt4-bin
    190    qt4-bin_MODE = 755
    191    qt4-bin_INST = $(INST_BIN)
    192    qt4-bin_SOURCES = \
    193         $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(VBOX_PATH_QT_LIB)/lib$(qtmod)$(SUFF_DLL).4) \
    194         $(VBOX_PATH_QT)/plugins/accessible/libqtaccessiblewidgets$(SUFF_DLL)=>accessible/libqtaccessiblewidgets$(SUFF_DLL)
    195   endif
    196  endif # VBOX_WITH_ORACLE_QT
    197 endif
    198 
     199else # VBOX_WITH_QTGUI_V5
     200 ifeq ($(KBUILD_TARGET),darwin)
     201  include $(KBUILD_PATH)/units/qt5.kmk
     202  INSTALLS += qt5-bin
     203  qt5-bin_MODE = 755
     204  qt5-bin_INST = $(INST_VIRTUALBOX)Contents/
     205  qt5-bin_SOURCES = $(foreach qtmod,$(VBOX_QT_MOD_NAMES), \
     206   $(PATH_SDK_QT5_LIB)/$(qtmod).framework/Versions/5/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/5/$(qtmod) \
     207   $(PATH_SDK_QT5_LIB)/$(qtmod).framework/Versions/5/Resources/Info.plist=>Frameworks/$(qtmod).framework/Versions/5/Resources/Info.plist)
     208  qt5-bin_SOURCES += \
     209   $(PATH_SDK_QT5)/plugins/platforms/libqcocoa$(SUFF_DLL)=>PlugIns/platforms/libqcocoa$(SUFF_DLL) \
     210   $(PATH_SDK_QT5)/plugins/platforms/libqminimal$(SUFF_DLL)=>PlugIns/platforms/libqminimal$(SUFF_DLL) \
     211   $(PATH_SDK_QT5)/plugins/platforms/libqoffscreen$(SUFF_DLL)=>PlugIns/platforms/libqoffscreen$(SUFF_DLL)
     212  qt5-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
     213   Frameworks/$(qtmod).framework/Versions/Current=>5 \
     214   Frameworks/$(qtmod).framework/$(qtmod)=>Versions/5/$(qtmod) \
     215   Frameworks/$(qtmod).framework/Resources=>Versions/5/Resources)
     216 else # WIN || X11
     217  if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
     218   include $(KBUILD_PATH)/units/qt5.kmk
     219   ifeq ($(KBUILD_TARGET),win)
     220    INSTALLS += qt5-bin
     221    qt5-bin_MODE = 755
     222    qt5-bin_INST = $(INST_BIN)
     223    qt5-bin_SOURCES = \
     224     $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/bin/$(qtmod)$(SUFF_DLL)))
     225    ifdef VBOX_WITH_QT_PDBS
     226     qt5-bin_SOURCES += \
     227      $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(VBOX_PATH_QT_LIB)/$(qtmod).pdb)
     228    endif
     229   else # X11
     230    INSTALLS += qt5-bin
     231    qt5-bin_MODE = 755
     232    qt5-bin_INST = $(INST_BIN)
     233    qt5-bin_SOURCES = \
     234     $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(VBOX_PATH_QT_LIB)/lib$(qtmod)$(SUFF_DLL).5) \
     235     $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(VBOX_PATH_QT_LIB)/lib$(qtmod)$(SUFF_DLL).5.5.1) \
     236     $(VBOX_PATH_QT)/plugins/platforms/libqxcb$(SUFF_DLL)=>platforms/libqxcb$(SUFF_DLL)
     237   endif # X11
     238  endif # VBOX_WITH_ORACLE_QT || VBOX_WITH_QT_PAYLOAD
     239 endif # WIN || X11
     240endif # VBOX_WITH_QTGUI_V5
    199241
    200242#

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

    r59473 r59509  
    9090# Debugger GUI component (Qt4).
    9191#
    92 USES += qt4
     92ifeq ($(VBOX_WITH_QTGUI_V5),)
     93 USES += qt4
     94else # VBOX_WITH_QTGUI_V5
     95 USES += qt5
     96endif # VBOX_WITH_QTGUI_V5
    9397DLLS += VBoxDbg
    9498VBoxDbg_TEMPLATE = VBOXQTGUI
    … …  
    96100VBoxDbg_INCS = .
    97101VBoxDbg_QT_MODULES = Core Gui
     102ifneq ($(VBOX_WITH_QTGUI_V5),)
     103 # Qt5 requires additional modules:
     104 VBoxDbg_QT_MODULES += Widgets
     105endif # VBOX_WITH_QTGUI_V5
    98106VBoxDbg_QT_MOCHDRS = \
    99107        VBoxDbgGui.h \
    … …  
    118126PROGRAMS += tstVBoxDbg
    119127tstVBoxDbg_TEMPLATE     = VBOXQTGUIEXE
    120 tstVBoxDbg_USES         = qt4
    121 tstVBoxDbg_QTTOOL       = QT4
     128ifeq ($(VBOX_WITH_QTGUI_V5),)
     129 tstVBoxDbg_USES         = qt4
     130 tstVBoxDbg_QTTOOL       = QT4
     131else # VBOX_WITH_QTGUI_V5
     132 tstVBoxDbg_USES         = qt5
     133 tstVBoxDbg_QTTOOL       = QT5
     134endif # VBOX_WITH_QTGUI_V5
    122135tstVBoxDbg_QT_MODULES   = Core Gui
     136ifneq ($(VBOX_WITH_QTGUI_V5),)
     137 # Qt5 requires additional modules:
     138 tstVBoxDbg_QT_MODULES += Widgets
     139endif # VBOX_WITH_QTGUI_V5
    123140tstVBoxDbg_SOURCES      = testcase/tstVBoxDbg.cpp
    124141tstVBoxDbg_LIBS         = \

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

    r59473 r59509  
    9292# VirtualBox - The GUI program.
    9393#
    94 USES += qt4
     94ifeq ($(VBOX_WITH_QTGUI_V5),)
     95 USES += qt4
     96else # VBOX_WITH_QTGUI_V5
     97 USES += qt5
     98endif # VBOX_WITH_QTGUI_V5
    9599VirtualBox_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQTGUI,VBOXQTGUIEXE)
    96100VirtualBox_NAME = VirtualBox
    … …  
    111115 VirtualBox_DEFS.darwin += VBOX_WITH_ICHAT_THEATER
    112116endif
     117ifneq ($(VBOX_WITH_QTGUI_V5),)
     118 # These important for us Qt4 defines missed in Qt5:
     119 VirtualBox_DEFS.linux     += Q_WS_X11
     120 VirtualBox_DEFS.solaris   += Q_WS_X11
     121 VirtualBox_DEFS.freebsd   += Q_WS_X11
     122 VirtualBox_DEFS.darwin    += Q_WS_MAC
     123 VirtualBox_DEFS.win       += Q_WS_WIN
     124endif # VBOX_WITH_QTGUI_V5
    113125VirtualBox_DEFS          += \
    114126        $(if $(VBOX_WITH_ADDITIONS_AUTOUPDATE_UI),VBOX_WITH_ADDITIONS_AUTOUPDATE_UI) \
    … …  
    220232VirtualBox_LIBS.solaris += Xinerama
    221233VirtualBox_LIBS.freebsd += Xinerama
     234
     235ifneq ($(VBOX_WITH_QTGUI_V5),)
     236 # No Qt5 without Xcb under X11:
     237 VirtualBox_LIBS.linux   += xcb
     238 VirtualBox_LIBS.solaris += xcb
     239 VirtualBox_LIBS.freebsd += xcb
     240endif # VBOX_WITH_QTGUI_V5
    222241
    223242ifneq ($(KBUILD_TARGET),win)
    … …  
    839858# (The include directory and lib/framework for each module will be added by the Qt4 unit.)
    840859VirtualBox_QT_MODULES = Core Gui
     860ifneq ($(VBOX_WITH_QTGUI_V5),)
     861 # Qt5 requires additional modules:
     862 VirtualBox_QT_MODULES += Widgets PrintSupport
     863 VirtualBox_QT_MODULES.linux   += X11Extras
     864 VirtualBox_QT_MODULES.solaris += X11Extras
     865 VirtualBox_QT_MODULES.freebsd += X11Extras
     866 VirtualBox_QT_MODULES.darwin  += MacExtras
     867 VirtualBox_QT_MODULES.win     += WinExtras
     868endif # VBOX_WITH_QTGUI_V5
    841869if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    842870 VirtualBox_QT_MODULES += OpenGL
    … …  
    11561184 PROGRAMS += tstSSLCertDownloads
    11571185 tstSSLCertDownloads_TEMPLATE   = VBOXQTGUIEXE
    1158  tstSSLCertDownloads_USES       = qt4
    1159  tstSSLCertDownloads_QTTOOL     = QT4
     1186 ifeq ($(VBOX_WITH_QTGUI_V5),)
     1187  tstSSLCertDownloads_USES       = qt4
     1188  tstSSLCertDownloads_QTTOOL     = QT4
     1189 else # VBOX_WITH_QTGUI_V5
     1190  tstSSLCertDownloads_USES       = qt5
     1191  tstSSLCertDownloads_QTTOOL     = QT5
     1192 endif # VBOX_WITH_QTGUI_V5
    11601193 tstSSLCertDownloads_QT_MODULES = Core Gui
    11611194 tstSSLCertDownloads_DEFS = VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS

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

    r59473 r59509  
    418418 ifneq ($(KBUILD_TARGET),darwin)
    419419  ifdef VBOX_WITH_VIDEOHWACCEL
    420    USES += qt4
     420   ifeq ($(VBOX_WITH_QTGUI_V5),)
     421    USES += qt4
     422   else # VBOX_WITH_QTGUI_V5
     423    USES += qt5
     424   endif # VBOX_WITH_QTGUI_V5
    421425  endif
    422426  PROGRAMS += VBoxTestOGL
    … …  
    437441  ifdef VBOX_WITH_VIDEOHWACCEL
    438442   VBoxTestOGL_QT_MODULES     += Core Gui OpenGL
     443   ifneq ($(VBOX_WITH_QTGUI_V5),)
     444    # Qt5 requires additional modules:
     445    VBoxTestOGL_QT_MODULES += Widgets
     446   endif # VBOX_WITH_QTGUI_V5
    439447   VBoxTestOGL_LDFLAGS.darwin += -framework OpenGL
    440448   VBoxTestOGL_LIBS.win       += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
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