儲存庫 vbox 的更動 87094

時間撮記:

2020-12-16 下午04:06:34 (4 年 以前)

作者:

vboxsync

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

141924

訊息:

FE/Qt: bugref:9893. Removing/replacing PATH_SDK_QT with PATH_SDK_QT5

位置:

trunk

檔案:

• Config.kmk (修改) (1 筆差異)
• Makefile.kmk (修改) (1 筆差異)
• src/VBox/Installer/darwin/Makefile.kmk (修改) (1 筆差異)

trunk/Config.kmk

@@ -7175 +7175 @@
  ifeq ($(KBUILD_TARGET),darwin)
   TEMPLATE_VBOXQTGUIEXE_POST_CMDS = $(QUIET)install_name_tool $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
-        $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT)/, \
+        $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT5)/, \
                 -change "$(prefix)$(qtmod).framework/Versions/5/$(qtmod)" \
                         "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/5/$(qtmod)" ) ) "$(out)"

trunk/Makefile.kmk

@@ -215 +215 @@
                         $(if-expr "$(suffix $2)" == "", -id "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Framework,@rpath)/$(notdir $(2)).framework/Version/5/$(notdir $(2))",) \
                         $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
-                                $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT)/, \
+                                $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT5)/, \
                                 -change "$(prefix)$(qtmod).framework/Versions/5/$(qtmod)" \
                                         "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/5/$(qtmod)" ) ) \

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

@@ -38 +38 @@
 
 VBOX_QT_VERSION_MAJOR = 5
-PATH_SDK_QT = $(PATH_SDK_QT5)
 
 # Unset this to speed up things during makefile hacking.