Changeset 67067 in vbox for trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

Timestamp:

May 24, 2017 3:43:59 PM (8 years ago)

Author:

vboxsync

Message:

drop VBOX_WITH_QTGUI_V5 and friends

File:

• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (8 diffs)

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

@@ -92 +92 @@
 # VirtualBox - The GUI program.
 #
-ifndef VBOX_WITH_QTGUI_V5
- USES += qt4
-else # VBOX_WITH_QTGUI_V5
- USES += qt5
-endif # VBOX_WITH_QTGUI_V5
+USES += qt5
 VirtualBox_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQTGUI,VBOXQTGUIEXE)
 VirtualBox_NAME = VirtualBox
@@ -227 +223 @@
 VirtualBox_LIBS.freebsd += Xinerama
 
-ifdef VBOX_WITH_QTGUI_V5
- # No Qt5 without Xcb under X11:
- VirtualBox_LIBS.linux   += xcb
- VirtualBox_LIBS.solaris += xcb
- VirtualBox_LIBS.freebsd += xcb
-endif # VBOX_WITH_QTGUI_V5
+VirtualBox_LIBS.linux   += xcb
+VirtualBox_LIBS.solaris += xcb
+VirtualBox_LIBS.freebsd += xcb
 
 ifneq ($(KBUILD_TARGET),win)
@@ -852 +845 @@
         src/platform/win/WinKeyboard.cpp
 
-if defined(VBOX_WITH_QTGUI_V5) && (defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD))
+if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
  INSTALLS.linux += VirtualBox.qt.conf
  INSTALLS.solaris += VirtualBox.qt.conf
@@ -906 +899 @@
 
 # The Qt modules we're using.
-# (The include directory and lib/framework for each module will be added by the Qt4 unit.)
-VirtualBox_QT_MODULES = Core Gui
-ifdef VBOX_WITH_QTGUI_V5
- # Qt5 requires additional modules:
- VirtualBox_QT_MODULES += Widgets PrintSupport
- VirtualBox_QT_MODULES.linux   += X11Extras
- VirtualBox_QT_MODULES.solaris += X11Extras
- VirtualBox_QT_MODULES.freebsd += X11Extras
- VirtualBox_QT_MODULES.darwin  += MacExtras
- VirtualBox_QT_MODULES.win     += WinExtras
-endif # VBOX_WITH_QTGUI_V5
+# (The include directory and lib/framework for each module will be added by the Qt unit.)
+VirtualBox_QT_MODULES = Core Gui Widgets PrintSupport
+VirtualBox_QT_MODULES.linux   += X11Extras
+VirtualBox_QT_MODULES.solaris += X11Extras
+VirtualBox_QT_MODULES.freebsd += X11Extras
+VirtualBox_QT_MODULES.darwin  += MacExtras
+VirtualBox_QT_MODULES.win     += WinExtras
 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
  VirtualBox_QT_MODULES += OpenGL
@@ -1121 +1110 @@
         $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-hdd.icns=>Resources/virtualbox-hdd.icns
 
- ifdef VBOX_WITH_QTGUI_V5
  # Qt5 requires qt.conf on Mac OS X:
  VirtualBox.app_SOURCES += \
         $(VirtualBox.app_0_OUTDIR)/qt.conf=>Resources/qt.conf
- endif # VBOX_WITH_QTGUI_V5
 
  $$(VirtualBox.app_0_OUTDIR)/Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/Info.plist $(VBOX_VERSION_MK) | $$(@D)/
@@ -1244 +1231 @@
  PROGRAMS += tstSSLCertDownloads
  tstSSLCertDownloads_TEMPLATE   = VBOXQTGUIEXE
- ifndef VBOX_WITH_QTGUI_V5
-  tstSSLCertDownloads_USES       = qt4
-  tstSSLCertDownloads_QTTOOL     = QT4
- else # VBOX_WITH_QTGUI_V5
-  tstSSLCertDownloads_USES       = qt5
-  tstSSLCertDownloads_QTTOOL     = QT5
- endif # VBOX_WITH_QTGUI_V5
+ tstSSLCertDownloads_USES       = qt5
+ tstSSLCertDownloads_QTTOOL     = QT5
  tstSSLCertDownloads_QT_MODULES = Core Gui
  tstSSLCertDownloads_DEFS = VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS
@@ -1383 +1365 @@
                 $(filter-out %.qrc,$(VirtualBox_SOURCES) $(VirtualBox_VBOX_EXTRA_NLS_SOURCES))
         $(call MSG_L1,lupdate all languages (nls/*.ts))
-        $(QUIET)$(if $(VBOX_WITH_QTGUI_V5),$(TOOL_QT5_LUPDATE),$(TOOL_QT4_LUPDATE)) \
+        $(QUIET)$(TOOL_QT5_LUPDATE) \
                 $^ \
                 -ts \
@@ -1395 +1377 @@
                 $(filter-out %.qrc,$(VirtualBox_SOURCES) $(VirtualBox_VBOX_EXTRA_NLS_SOURCES))
         $(call MSG_L1,lupdate $@)
-        $(QUIET)$(if $(VBOX_WITH_QTGUI_V5),$(TOOL_QT5_LUPDATE),$(TOOL_QT4_LUPDATE)) \
+        $(QUIET)$(TOOL_QT5_LUPDATE) \
                 $^ \
                 -ts \