vbox的更動 59468 路徑 trunk/src/VBox/Installer

時間撮記:

2016-1-26 上午10:32:53 (9 年 以前)

作者:

vboxsync

訊息:

FE/Qt: Qt5 migration (part 71): Preparing Qt5 tool: VBOX_WITH_QT4_SUN => VBOX_WITH_ORACLE_QT.

位置:

trunk/src/VBox/Installer

檔案:

• freebsd/Makefile.kmk (修改) (1 筆差異)
• linux/Makefile.kmk (修改) (2 筆差異)
• solaris/Makefile.kmk (修改) (4 筆差異)

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

@@ -157 +157 @@
  VBOX_FBSD_NO_STRIP += \
         $(VBOX_LICENSE_FILES) \
-        $(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_STAGE_BIN)/lib*VBox*)),) \
-        $(if $(VBOX_WITH_QT4_SUN),accessible/libqtaccessiblewidgets.so,) \
+        $(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)
  VBOX_FBSD_DESKTOP_FILE = \

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

@@ -261 +261 @@
         virtualbox.xml \
         $(VBOX_LICENSE_FILES) \
-        $(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_STAGE_BIN)/lib*VBox*)),) \
-        $(if $(VBOX_WITH_QT4_SUN),accessible/libqtaccessiblewidgets.so,) \
+        $(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
@@ -508 +508 @@
         archive/components \
         archive/nls \
-        $(if $(VBOX_WITH_QT4_SUN),archive/accessible,) \
+        $(if $(VBOX_WITH_ORACLE_QT),archive/accessible,) \
         $(if $(VBOX_WITH_PYTHON),\
           archive/sdk/installer \

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

@@ -333 +333 @@
         $(if $(VBOX_WITH_QTGUI),\
           VBoxKeyboard.so \
-          $(if $(VBOX_WITH_QT4_SUN),\
+          $(if $(VBOX_WITH_ORACLE_QT),\
             libQtCoreVBox.so.4 \
             libQtGuiVBox.so.4 \
@@ -424 +424 @@
 SOLARIS_QTLIBS =
 ifdef VBOX_WITH_QTGUI
- ifdef VBOX_WITH_QT4_SUN
+ ifdef VBOX_WITH_ORACLE_QT
   SOLARIS_QTLIBS += \
         libQtXmlVBox.so.4 \
@@ -540 +540 @@
                 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkginfo \
                 \
-                $(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_QT4_SUN),$(VBOX_PATH_QT4)/bin/qtconfig,) \
+                $(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_ORACLE_QT),$(VBOX_PATH_QT4)/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 +603 @@
 
 # VirtualBox: Arch specific files.
-        $(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_QT4_SUN)\
+        $(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,)