Changeset 59472 in vbox

Timestamp:

Jan 26, 2016 11:54:57 AM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Qt5 migration (part 74): Preparing Qt5 tool: VBOX_QT4_MOD => VBOX_QT_MOD.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (4 diffs)
• src/VBox/Installer/darwin/Makefile.kmk (modified) (5 diffs)

trunk/Config.kmk

@@ -5248 +5248 @@
  endif
 
- VBOX_QT4_MOD = QtCore QtGui $(if $(VBOX_GUI_USE_QGL),QtOpenGL,)
- VBOX_QT4_MOD_NAMES = $(foreach qtmod,$(VBOX_QT4_MOD),$(qtmod)$(VBOX_QT_INFIX))
+ VBOX_QT_MOD = QtCore QtGui $(if $(VBOX_GUI_USE_QGL),QtOpenGL,)
+ VBOX_QT_MOD_NAMES = $(foreach qtmod,$(VBOX_QT_MOD),$(qtmod)$(VBOX_QT_INFIX))
 
  # Hack LD_LIBRARY_PATH for stuff in tools.

trunk/Makefile.kmk

@@ -153 +153 @@
  qt4-bin_MODE = 755
  qt4-bin_INST = $(INST_VIRTUALBOX)Contents/
- qt4-bin_SOURCES = $(foreach qtmod,$(VBOX_QT4_MOD_NAMES) \
+ qt4-bin_SOURCES = $(foreach qtmod,$(VBOX_QT_MOD_NAMES) \
         ,$(PATH_SDK_QT4_LIB)/$(qtmod).framework/Versions/4/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
          $(PATH_SDK_QT4_LIB)/$(qtmod).framework/Contents/Info.plist=>Frameworks/$(qtmod).framework/Versions/4/Resources/Info.plist \
@@ -167 +167 @@
         $(VBOX_PATH_QT)/plugins/accessible/libqtaccessiblewidgets.dylib=>MacOS/accessible/libqtaccessiblewidgets.dylib
  endif
- qt4-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
+ qt4-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT_MOD_NAMES) \
                 ,Frameworks/$(qtmod).framework/Versions/Current=>4 \
                  Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod) \
@@ -179 +179 @@
    qt4-bin_INST = $(INST_BIN)
    qt4-bin_SOURCES = \
-        $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(call VBOX_RE_SIGN_DLL_FN,qt4-bin,$(VBOX_PATH_QT_LIB)/$(qtmod)4$(SUFF_DLL))) \
+        $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(call VBOX_RE_SIGN_DLL_FN,qt4-bin,$(VBOX_PATH_QT_LIB)/$(qtmod)4$(SUFF_DLL))) \
         $(call VBOX_RE_SIGN_DLL_FN,qt4-bin,$(VBOX_PATH_QT)/plugins/accessible/qtaccessiblewidgets4$(SUFF_DLL))=>accessible/qtaccessiblewidgets4$(SUFF_DLL)
    ifdef VBOX_WITH_QT_PDBS
     qt4-bin_SOURCES += \
-        $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(VBOX_PATH_QT_LIB)/$(qtmod)4.pdb) \
+        $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(VBOX_PATH_QT_LIB)/$(qtmod)4.pdb) \
         $(VBOX_PATH_QT)/plugins/accessible/qtaccessiblewidgets4.pdb=>accessible/qtaccessiblewidgets4.pdb
    endif
@@ -191 +191 @@
    qt4-bin_INST = $(INST_BIN)
    qt4-bin_SOURCES = \
-        $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(VBOX_PATH_QT_LIB)/lib$(qtmod)$(SUFF_DLL).4) \
+        $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(VBOX_PATH_QT_LIB)/lib$(qtmod)$(SUFF_DLL).4) \
         $(VBOX_PATH_QT)/plugins/accessible/libqtaccessiblewidgets$(SUFF_DLL)=>accessible/libqtaccessiblewidgets$(SUFF_DLL)
   endif

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

@@ -339 +339 @@
 
 VBOX_DI_VBAPP_DYLIBS = \
-        $(foreach qtmod, $(VBOX_QT4_MOD_NAMES), Frameworks/$(qtmod).framework/Versions/4/$(qtmod)) \
+        $(foreach qtmod, $(VBOX_QT_MOD_NAMES), Frameworks/$(qtmod).framework/Versions/4/$(qtmod)) \
         MacOS/VBoxDD.dylib \
         MacOS/VBoxDD2.dylib \
@@ -513 +513 @@
         Frameworks/QtGui$(VBOX_QT_INFIX).framework/Versions/4/Resources/qt_menu.nib/info.nib \
         Frameworks/QtGui$(VBOX_QT_INFIX).framework/Versions/4/Resources/qt_menu.nib/keyedobjects.nib \
-        $(foreach qtmod, $(VBOX_QT4_MOD_NAMES), Frameworks/$(qtmod).framework/Versions/4/Resources/Info.plist)
+        $(foreach qtmod, $(VBOX_QT_MOD_NAMES), Frameworks/$(qtmod).framework/Versions/4/Resources/Info.plist)
 
 VBOX_DI_VBAPP_SYMLINKS = \
         Resources/VirtualBoxVM.app/Contents/MacOS=>../../../MacOS/ \
         Resources/vmstarter.app/Contents/MacOS=>../../../MacOS/ \
-        $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
+        $(foreach qtmod, $(VBOX_QT_MOD_NAMES) \
         ,Frameworks/$(qtmod).framework/Versions/Current=>4 )
 ifndef VBOX_NOT_OSX_105
-VBOX_DI_VBAPP_SYMLINKS += $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
+VBOX_DI_VBAPP_SYMLINKS += $(foreach qtmod, $(VBOX_QT_MOD_NAMES) \
         ,Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod) \
          Frameworks/$(qtmod).framework/Resources=>Versions/4/Resources/ )
@@ -678 +678 @@
 if 1
         @# We cannot use @executable_path together with setuid binaries, dyld gets upset about it. So, fix Qt libs and users.
-        $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
+        $(foreach qtmod, $(VBOX_QT_MOD_NAMES) \
                 ,install_name_tool -id /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
                         $(VBOX_PATH_VBOX_APP_TMP)/Contents/Frameworks/$(qtmod).framework/Versions/4/$(qtmod)$(NLTAB) )
@@ -686 +686 @@
                 $(VBOX_DI_VBAPP_PROGS) \
                 ,install_name_tool \
-                        $(foreach qtmod, $(VBOX_QT4_MOD_NAMES), \
+                        $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
                                 -change           @executable_path/../Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
                                 /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
@@ -713 +713 @@
         @# Signed the binaries and the application bundle.
 ifdef VBOX_SIGNING_MODE
-        $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
+        $(foreach qtmod, $(VBOX_QT_MOD_NAMES) \
                 ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/Frameworks/$(qtmod).framework/Versions/4/$(qtmod),org.virtualbox.app.frameworks.$(qtmod)) )
-        $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
+        $(foreach qtmod, $(VBOX_QT_MOD_NAMES) \
                 ,$(NLTAB)$(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/Frameworks/$(qtmod).framework/Versions/4,org.virtualbox.app.frameworks.$(qtmod)) )
         $(foreach dylib, \