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

Timestamp:

Jan 26, 2016 11:12:22 AM (9 years ago)

Author:

vboxsync

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

105228

Message:

FE/Qt: Qt5 migration (part 72): Preparing Qt5 tool: VBOX_PATH_QT4 => VBOX_PATH_QT.

File:

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

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

@@ -414 +414 @@
 
 ## @def SOLARIS_QTLIBS
-# List of Qt shared libs that we need to copy from $(VBOX_PATH_QT4)/lib/ to /opt/VirtualBox/$(VBOX_SI_ARCH)/
+# 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
@@ -420 +420 @@
 SOLARIS_QTLIBS.STRIP   := no
 SOLARIS_QTLIBS.MODE    := 0644
-SOLARIS_QTLIBS.SRC     := $(VBOX_PATH_QT4)/lib
+SOLARIS_QTLIBS.SRC     := $(VBOX_PATH_QT)/lib
 SOLARIS_QTLIBS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)
 SOLARIS_QTLIBS =
@@ -540 +540 @@
                 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkginfo \
                 \
-                $(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_ORACLE_QT),$(VBOX_PATH_QT4)/bin/qtconfig,) \
+                $(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_ORACLE_QT),$(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,) \
@@ -605 +605 @@
         $(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_ORACLE_QT)\
         ,$(INSTALL) -m 0755 \
-                $(VBOX_PATH_QT4)/bin/qtconfig   $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/VBoxQtconfig,)
+                $(VBOX_PATH_QT)/bin/qtconfig    $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/VBoxQtconfig,)
 
         $(if-expr defined(VBOX_WITH_QTGUI) \