Changeset 60989 in vbox

Timestamp:

May 15, 2016 12:33:13 AM (9 years ago)

Author:

vboxsync

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

107233

Message:

darwin/qt5: PlugIns -> plugins. Gotta use the spelling we compiled it with, or it won't work on case sensitive file systems. (Also, please don't overdo the Makefile else/endif documentation like in the GUI, most can move our eyes up 4 lines and find the if.

Location:

trunk

Files:

• Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/darwin/Makefile.kmk (modified) (1 diff)

trunk/Makefile.kmk

@@ -207 +207 @@
    $(PATH_SDK_QT5_LIB)/$(qtmod).framework/Versions/5/Resources/Info.plist=>Frameworks/$(qtmod).framework/Versions/5/Resources/Info.plist)
   qt5-bin_SOURCES += \
-   $(PATH_SDK_QT5)/plugins/platforms/libqcocoa$(SUFF_DLL)=>PlugIns/platforms/libqcocoa$(SUFF_DLL) \
-   $(PATH_SDK_QT5)/plugins/platforms/libqminimal$(SUFF_DLL)=>PlugIns/platforms/libqminimal$(SUFF_DLL) \
-   $(PATH_SDK_QT5)/plugins/platforms/libqoffscreen$(SUFF_DLL)=>PlugIns/platforms/libqoffscreen$(SUFF_DLL)
+   $(PATH_SDK_QT5)/plugins/platforms/libqcocoa$(SUFF_DLL)=>plugins/platforms/libqcocoa$(SUFF_DLL) \
+   $(PATH_SDK_QT5)/plugins/platforms/libqminimal$(SUFF_DLL)=>plugins/platforms/libqminimal$(SUFF_DLL) \
+   $(PATH_SDK_QT5)/plugins/platforms/libqoffscreen$(SUFF_DLL)=>plugins/platforms/libqoffscreen$(SUFF_DLL)
   qt5-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
    Frameworks/$(qtmod).framework/Versions/Current=>5 \

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

@@ -524 +524 @@
         Frameworks/QtGui$(VBOX_QT_INFIX).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/Resources/qt_menu.nib/info.nib \
         Frameworks/QtGui$(VBOX_QT_INFIX).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/Resources/qt_menu.nib/keyedobjects.nib
-else # VBOX_WITH_QTGUI_V5
+else
  VBOX_DI_VBAPP_MISC_FILES += \
-        PlugIns/platforms/libqcocoa$(SUFF_DLL) \
-        PlugIns/platforms/libqminimal$(SUFF_DLL) \
-        PlugIns/platforms/libqoffscreen$(SUFF_DLL)
+        plugins/platforms/libqcocoa$(SUFF_DLL) \
+        plugins/platforms/libqminimal$(SUFF_DLL) \
+        plugins/platforms/libqoffscreen$(SUFF_DLL)
 endif # VBOX_WITH_QTGUI_V5
 VBOX_DI_VBAPP_MISC_FILES += \