Changeset 60072 in vbox for trunk/src/VBox/Installer

Timestamp:

Mar 17, 2016 12:18:23 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

106066

Message:

'xcb' for Qt5 on X11 and make it more obvious if VBOX_WITH_QTGUI_V5 is active or not

Location:

trunk/src/VBox/Installer

Files:

• darwin/Makefile.kmk (modified) (3 diffs)
• linux/Makefile.kmk (modified) (3 diffs)

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

@@ -37 +37 @@
 VBOX_PATH_DIST_OTHER = $(error VBOX_PATH_DIST_OTHER used in a non-combined package deal)
 
-ifeq ($(VBOX_WITH_QTGUI_V5),)
+ifndef VBOX_WITH_QTGUI_V5
  VBOX_QT_VERSION_MAJOR = 4
  PATH_SDK_QT = $(PATH_SDK_QT4)
@@ -517 +517 @@
         MacOS/VBoxEFI64.fd
 endif
-ifeq ($(VBOX_WITH_QTGUI_V5),)
+ifndef VBOX_WITH_QTGUI_V5
  VBOX_DI_VBAPP_MISC_FILES += \
         Frameworks/QtGui$(VBOX_QT_INFIX).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/Resources/qt_menu.nib/classes.nib \
@@ -714 +714 @@
                         $(VBOX_PATH_VBOX_APP_TMP)/Contents/$(f)$(NLTAB) )
 endif
-ifneq ($(VBOX_WITH_QTGUI_V5),)
+ifdef VBOX_WITH_QTGUI_V5
         $(QUIET)$(APPEND) $(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/qt.conf "[Paths]"
         $(QUIET)$(APPEND) $(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/qt.conf "Prefix =" /Applications/VirtualBox.app/Contents

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

@@ -249 +249 @@
 endif
 
-# Qt4 GUI
+# Qt GUI
 ifdef VBOX_WITH_QTGUI
  include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
@@ -256 +256 @@
         VirtualBox \
         $(if $(VBOX_WITH_HARDENING),VirtualBox.so) \
-        $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so DbgPlugInDiggers.so)
- VBOX_LNX_NO_STRIP += \
-        virtualbox.desktop \
-        virtualbox.xml \
-        $(VBOX_LICENSE_FILES) \
+        $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so DbgPlugInDiggers.so)
+ VBOX_LNX_NO_STRIP += \
+        virtualbox.desktop \
+        virtualbox.xml \
+        $(VBOX_LICENSE_FILES) \
         $(if $(VBOX_WITH_ORACLE_QT),$(notdir $(wildcard $(PATH_STAGE_BIN)/lib*VBox*)),) \
-        $(if $(VBOX_WITH_ORACLE_QT),accessible/libqtaccessiblewidgets.so,) \
         $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm) \
-        icons
+        icons
+ ifndef VBOX_WITH_QTGUI_V5
+  VBOX_LNX_NO_STRIP += \
+        $(if $(VBOX_WITH_ORACLE_QT),accessible/libqtaccessiblewidgets.so,)
+ else # VBOX_WITH_QTGUI_V5
+  VBOX_LNX_NO_STRIP += \
+        platforms/libqxcb.so
+ endif # VBOX_WITH_QTGUI_v5
 endif
 
@@ -508 +514 @@
         archive/components \
         archive/nls \
-        $(if $(VBOX_WITH_ORACLE_QT),archive/accessible,) \
+        $(if $(VBOX_WITH_ORACLE_QT),\
+          archive/accessible,) \
+        $(if $(VBOX_WITH_QTGUI_V5),\
+          archive/platforms,) \
         $(if $(VBOX_WITH_PYTHON),\
           archive/sdk/installer \