Changeset 61055 in vbox for trunk/src/VBox/Installer/solaris

Timestamp:

May 19, 2016 5:36:04 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Qt5 migration (part 118): Makefile changes for Qt5 libraries.

File:

• trunk/src/VBox/Installer/solaris/Makefile.kmk (modified) (5 diffs)

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

@@ -332 +332 @@
         $(if $(VBOX_WITH_JXPCOM),libvboxjxpcom.so,) \
         $(if $(VBOX_WITH_QTGUI),\
-          VBoxKeyboard.so \
-          $(if $(VBOX_WITH_ORACLE_QT),\
-            libQtCoreVBox.so.4 \
-            libQtGuiVBox.so.4 \
-            $(if $(VBOX_GUI_USE_QGL),libQtOpenGLVBox.so.4,) \
-            accessible/libqtaccessiblewidgets.so,)) \
+          VBoxKeyboard.so) \
         $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so DbgPlugInDiggers.so,) \
         $(if $(VBOX_WITH_CROGL),\
@@ -347 +342 @@
         components/VBoxSVCM.so \
         components/VBoxXPCOMIPCC.so
+
+ifdef VBOX_WITH_QTGUI
+ ifdef VBOX_WITH_QTGUI_V5
+  ifdef VBOX_WITH_ORACLE_QT
+   SOLARIS_STRIP_BINS += \
+          libQt5CoreVBox.so.5 \
+          libQt5GuiVBox.so.5 \
+          libQt5XcbQpaVBox.so.5 \
+          libQt5PrintSupportVBox.so.5 \
+          libQt5DBusVBox.so.5 \
+          libQt5X11ExtrasVBox.so.5 \
+          libQt5WidgetsVBox.so.5 \
+          plugins/platforms/libqxcb.so \
+          $(if $(VBOX_GUI_USE_QGL),libQt5OpenGLVBox.so.5,)
+  endif  
+ else # VBOX_WITH_QTGUI_V5
+  ifdef VBOX_WITH_ORACLE_QT
+   SOLARIS_STRIP_BINS += \
+          libQtCoreVBox.so.4 \
+          libQtGuiVBox.so.4 \
+          $(if $(VBOX_GUI_USE_QGL),libQtOpenGLVBox.so.4,) \
+          accessible/libqtaccessiblewidgets.so
+  endif # VBOX_WITH_ORACLE_QT
+ endif # !VBOX_WITH_QTGUI_V5
+endif #VBOX_WITH_QTGUI
+
 ifdef VBOX_WITH_32_ON_64_MAIN_API
  SOLARIS_STRIP_BINS += \
@@ -416 +437 @@
 # List of Qt shared libs that we need to copy from $(VBOX_PATH_QT)/lib/ to /opt/VirtualBox/$(VBOX_SI_ARCH)/
 # so that we can run VBoxQtConfig.
-SOLARIS_FILE_LIST_VARS += SOLARIS_QTLIBS
-SOLARIS_QTLIBS.SUBDIRS := no
-SOLARIS_QTLIBS.STRIP   := no
-SOLARIS_QTLIBS.MODE    := 0644
-SOLARIS_QTLIBS.SRC     := $(VBOX_PATH_QT)/lib
-SOLARIS_QTLIBS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)
-SOLARIS_QTLIBS =
-ifdef VBOX_WITH_QTGUI
- ifdef VBOX_WITH_ORACLE_QT
-  SOLARIS_QTLIBS += \
-        libQtXmlVBox.so.4 \
-        libQtSqlVBox.so.4 \
-        libQt3SupportVBox.so.4
-  SOLARIS_USRBIN_LINKS += \
-        VBoxQtconfig
- endif
+ifndef VBOX_WITH_QTGUI_V5
+ SOLARIS_FILE_LIST_VARS += SOLARIS_QTLIBS
+ SOLARIS_QTLIBS.SUBDIRS := no
+ SOLARIS_QTLIBS.STRIP   := no
+ SOLARIS_QTLIBS.MODE    := 0644
+ SOLARIS_QTLIBS.SRC     := $(VBOX_PATH_QT)/lib
+ SOLARIS_QTLIBS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)
+ SOLARIS_QTLIBS =
+ ifdef VBOX_WITH_QTGUI
+  ifdef VBOX_WITH_ORACLE_QT 
+    SOLARIS_QTLIBS += \
+          libQtXmlVBox.so.4 \
+          libQtSqlVBox.so.4 \
+          libQt3SupportVBox.so.4
+    SOLARIS_USRBIN_LINKS += \
+          VBoxQtconfig
+  endif
+
  include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
  SOLARIS_COMMON += $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm)
+ endif
 endif
 
@@ -540 +564 @@
                 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkginfo \
                 \
-                $(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_ORACLE_QT),$(VBOX_PATH_QT)/bin/qtconfig,) \
+                $(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_ORACLE_QT) && !defined(VBOX_WITH_QTGUI_V5),$(VBOX_PATH_QT)/bin/qtconfig,) \
                 $(if-expr defined(VBOX_WITH_ADDITIONS_PACKING),$(PATH_STAGE_BIN)/additions/VBoxGuestAdditions.iso,) \
                 $(if-expr !defined(VBOX_OSE) && defined(VBOX_WITH_VBOXSDL),$(PATH_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2,) \
@@ -603 +627 @@
 
 # VirtualBox: Arch specific files.
-        $(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_ORACLE_QT)\
+        $(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_ORACLE_QT) && !defined(VBOX_WITH_QTGUI_V5)\
         ,$(INSTALL) -m 0755 \
                 $(VBOX_PATH_QT)/bin/qtconfig    $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/VBoxQtconfig,)