Changeset 60129 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 21, 2016 5:46:42 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: added qt.conf for local builds if we compile against our Qt5 library, otherwise the plugin directory cannot be found

File:

• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -816 +816 @@
         src/platform/win/WinKeyboard.cpp
 
+if defined(VBOX_WITH_QTGUI_V5) && (defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD))
+ INSTALLS.linux += VirtualBox.qt.conf
+ VirtualBox.qt.conf_INST = $(INST_BIN)
+ VirtualBox.qt.conf_MODE = 644
+ VirtualBox.qt.conf_SOURCES = $(VirtualBox_0_OUTDIR)/qt.conf=>qt.conf
+
+$$(VirtualBox_0_OUTDIR)/qt.conf: $(PATH_SUB_CURRENT)/Makefile.kmk $(VBOX_VERSION_MK) | $$(@D)/
+        $(QUIET)$(RM) -f $@
+        $(QUIET)$(APPEND) $@ "[Paths]"
+        $(QUIET)$(APPEND) $@ "Plugins =" $(PATH_OUT)/$(INST_BIN)/plugins
+endif
+
 VirtualBox_DEFS.darwin += VBOX_DARWIN_USE_NATIVE_CONTROLS
 VirtualBox_SOURCES.darwin += \
@@ -1078 +1090 @@
         $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-hdd.icns=>Resources/virtualbox-hdd.icns
 
-ifdef VBOX_WITH_QTGUI_V5
+ ifdef VBOX_WITH_QTGUI_V5
  # Qt5 requires qt.conf on Mac OS X:
  VirtualBox.app_SOURCES += \
         $(VirtualBox.app_0_OUTDIR)/qt.conf=>Resources/qt.conf
-endif # VBOX_WITH_QTGUI_V5
+ endif # VBOX_WITH_QTGUI_V5
 
 $$(VirtualBox.app_0_OUTDIR)/Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/Info.plist $(VBOX_VERSION_MK) | $$(@D)/