Changeset 62828 in vbox

Timestamp:

Aug 1, 2016 4:03:38 PM (9 years ago)

Author:

vboxsync

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

109424

Message:

Using the Qt 5.6.1 for Linux host.

File:

• trunk/Makefile.kmk (modified) (2 diffs)

trunk/Makefile.kmk

@@ -257 +257 @@
      # ugly but we need to prevent kBuild from hard-linking otherwise we
      # (indirectly) change the binaries in tools
+     ifneq ($(KBUILD_TARGET),solaris)
+      QT5_VERSION = 5.6.1
+     else
+      QT5_VERSION = 5.5.1
+     endif
      qt5-bin_SOURCES = \
-      $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.5.5.1=>lib$(qtmod).so.5) \
+      $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.$(QT5_VERSION)=>lib$(qtmod).so.5) \
       $(foreach lib,$(VBOX_QT_PLUGINS),$(qt5-bin_0_OUTDIR)/$(lib)=>$(lib))
       ifneq ($(KBUILD_TARGET),solaris)
@@ -265 +270 @@
       endif # solaris
 
-$(foreach qtmod,$(VBOX_QT_MOD_NAMES),$$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.5.5.1): \
+$(foreach qtmod,$(VBOX_QT_MOD_NAMES),$$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.$(QT5_VERSION)): \
         $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/% | $$(qt5-bin_0_OUTDIR)/
         $(call MSG_INST_FILE,$^,$@)