VirtualBox

Changeset 59469 in vbox


Ignore:
Timestamp:
Jan 26, 2016 11:12:22 AM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
105228
Message:

FE/Qt: Qt5 migration (part 72): Preparing Qt5 tool: VBOX_PATH_QT4 => VBOX_PATH_QT.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r59468 r59469  
    52155215 # be cleaned up properly later some time (not important now).
    52165216 #
    5217  ifeq ($(VBOX_PATH_QT4),)
     5217 ifeq ($(VBOX_PATH_QT),)
    52185218  ifeq ($(KBUILD_TARGET),darwin)
    5219    VBOX_PATH_QT4 := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*)))
    5220    ifeq ($(VBOX_PATH_QT4),)
     5219   VBOX_PATH_QT := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*)))
     5220   ifeq ($(VBOX_PATH_QT),)
    52215221    ifneq ($(wildcard /Library/Frameworks/QtCore.framework),)
    52225222     # Using the global installation (for OSE).
    5223      VBOX_PATH_QT4 ?= /usr
    5224      VBOX_PATH_QT4_FRAMEWORKS ?= /Library/Frameworks
     5223     VBOX_PATH_QT ?= /usr
     5224     VBOX_PATH_QT_FRAMEWORKS ?= /Library/Frameworks
    52255225    endif
    52265226   endif
    52275227  else if1of ($(KBUILD_TARGET), win)
    5228    VBOX_PATH_QT4 ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*))))
     5228   VBOX_PATH_QT ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*))))
    52295229  else if1of ($(KBUILD_TARGET), linux solaris)
    5230    VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*)))
    5231    ifneq ($(VBOX_PATH_QT4),)
     5230   VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*)))
     5231   ifneq ($(VBOX_PATH_QT),)
    52325232    VBOX_WITH_ORACLE_QT = 1
    52335233   endif
    52345234  endif
    52355235 endif
    5236  ifeq ($(VBOX_PATH_QT4),)
     5236 ifeq ($(VBOX_PATH_QT),)
    52375237  if1of ($(USERNAME), bird)
    52385238   # gentoo (64-bit)
    5239    VBOX_PATH_QT4          ?= /usr
    5240    VBOX_PATH_QT4_LIB      ?= /usr/lib/qt4
    5241   endif
    5242  endif
    5243  VBOX_PATH_QT4            ?= /usr
    5244  VBOX_PATH_QT4_LIB        ?= $(VBOX_PATH_QT4)/lib
     5239   VBOX_PATH_QT          ?= /usr
     5240   VBOX_PATH_QT_LIB      ?= /usr/lib/qt4
     5241  endif
     5242 endif
     5243 VBOX_PATH_QT            ?= /usr
     5244 VBOX_PATH_QT_LIB        ?= $(VBOX_PATH_QT)/lib
    52455245
    52465246 ifdef VBOX_WITH_ORACLE_QT
    … …  
    52545254 ifdef VBOX_WITH_ORACLE_QT
    52555255  if1of ($(KBUILD_TARGET), linux)
    5256    export LD_LIBRARY_PATH := $(VBOX_PATH_QT4_LIB):$(LD_LIBRARY_PATH)
     5256   export LD_LIBRARY_PATH := $(VBOX_PATH_QT_LIB):$(LD_LIBRARY_PATH)
    52575257  endif
    52585258 endif

  • trunk/Makefile.kmk

    r59468 r59469  
    163163        $(PATH_SDK_QT4_LIB)/QtGui$(VBOX_QT4_INFIX).framework/Versions/4/Resources/qt_menu.nib/keyedobjects.nib=>Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Versions/4/Resources/qt_menu.nib/keyedobjects.nib
    164164 endif
    165  ifneq ($(wildcard $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets.dylib),)
     165 ifneq ($(wildcard $(VBOX_PATH_QT)/plugins/accessible/libqtaccessiblewidgets.dylib),)
    166166  qt4-bin_SOURCES += \
    167         $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets.dylib=>MacOS/accessible/libqtaccessiblewidgets.dylib
     167        $(VBOX_PATH_QT)/plugins/accessible/libqtaccessiblewidgets.dylib=>MacOS/accessible/libqtaccessiblewidgets.dylib
    168168 endif
    169169 qt4-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT4_MOD_NAMES) \
    … …  
    179179   qt4-bin_INST = $(INST_BIN)
    180180   qt4-bin_SOURCES = \
    181         $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(call VBOX_RE_SIGN_DLL_FN,qt4-bin,$(VBOX_PATH_QT4_LIB)/$(qtmod)4$(SUFF_DLL))) \
    182         $(call VBOX_RE_SIGN_DLL_FN,qt4-bin,$(VBOX_PATH_QT4)/plugins/accessible/qtaccessiblewidgets4$(SUFF_DLL))=>accessible/qtaccessiblewidgets4$(SUFF_DLL)
     181        $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(call VBOX_RE_SIGN_DLL_FN,qt4-bin,$(VBOX_PATH_QT_LIB)/$(qtmod)4$(SUFF_DLL))) \
     182        $(call VBOX_RE_SIGN_DLL_FN,qt4-bin,$(VBOX_PATH_QT)/plugins/accessible/qtaccessiblewidgets4$(SUFF_DLL))=>accessible/qtaccessiblewidgets4$(SUFF_DLL)
    183183   ifdef VBOX_WITH_QT_PDBS
    184184    qt4-bin_SOURCES += \
    185         $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(VBOX_PATH_QT4_LIB)/$(qtmod)4.pdb) \
    186         $(VBOX_PATH_QT4)/plugins/accessible/qtaccessiblewidgets4.pdb=>accessible/qtaccessiblewidgets4.pdb
     185        $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(VBOX_PATH_QT_LIB)/$(qtmod)4.pdb) \
     186        $(VBOX_PATH_QT)/plugins/accessible/qtaccessiblewidgets4.pdb=>accessible/qtaccessiblewidgets4.pdb
    187187   endif
    188188  else
    … …  
    191191   qt4-bin_INST = $(INST_BIN)
    192192   qt4-bin_SOURCES = \
    193         $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(VBOX_PATH_QT4_LIB)/lib$(qtmod)$(SUFF_DLL).4) \
    194         $(VBOX_PATH_QT4)/plugins/accessible/libqtaccessiblewidgets$(SUFF_DLL)=>accessible/libqtaccessiblewidgets$(SUFF_DLL)
     193        $(foreach qtmod,$(VBOX_QT4_MOD_NAMES),$(VBOX_PATH_QT_LIB)/lib$(qtmod)$(SUFF_DLL).4) \
     194        $(VBOX_PATH_QT)/plugins/accessible/libqtaccessiblewidgets$(SUFF_DLL)=>accessible/libqtaccessiblewidgets$(SUFF_DLL)
    195195  endif
    196196 endif # VBOX_WITH_ORACLE_QT

  • trunk/configure

    r59468 r59469  
    15851585          # most likely pkg-config gave us -I/usr/include/qt4 -I/usr/include/qt4/QtCore
    15861586          INCQT4=`echo "$INCQT4"|$KBUILD_SED 's|\([^ ]*\) .*|\1|'`
    1587           cnf_append "VBOX_PATH_QT4_LIB" "`strip_L "$LIBQT4"`"
     1587          cnf_append "VBOX_PATH_QT_LIB" "`strip_L "$LIBQT4"`"
    15881588          cnf_append "PATH_SDK_QT4_INC" "$INCQT4"
    15891589          # this is not quite right since the qt libpath does not have to be first...
    … …  
    16081608          else
    16091609            log_success "found version $moc_ver"
    1610             cnf_append "VBOX_PATH_QT4" "$TOOLQT4"
     1610            cnf_append "VBOX_PATH_QT" "$TOOLQT4"
    16111611            cnf_append "PATH_SDK_QT4" "$TOOLQT4"
    16121612            cnf_append "PATH_TOOL_QT4_BIN" "$TOOLQT4BIN"

  • trunk/configure.vbs

    r56905 r59469  
    20522052      CfgPrint "PATH_SDK_QT4          := " & strPathQt4
    20532053      CfgPrint "PATH_TOOL_QT4         := $(PATH_SDK_QT4)"
    2054       CfgPrint "VBOX_PATH_QT4         := $(PATH_SDK_QT4)"
     2054      CfgPrint "VBOX_PATH_QT         := $(PATH_SDK_QT4)"
    20552055      PrintResult "Qt4 ", strPathQt4
    20562056   end if

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

    r57453 r59469  
    689689                                -change           @executable_path/../Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
    690690                                /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
    691                                 -change              $(VBOX_PATH_QT4)/Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
     691                                -change               $(VBOX_PATH_QT)/Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
    692692                                /Applications/VirtualBox.app/Contents/Frameworks/$(qtmod).framework/Versions/4/$(qtmod) \
    693693                                -change                          $(PATH_SDK_QT4)/$(qtmod).framework/Versions/4/$(qtmod) \

  • trunk/src/VBox/Installer/solaris/Makefile.kmk

    r59468 r59469  
    414414
    415415## @def SOLARIS_QTLIBS
    416 # List of Qt shared libs that we need to copy from $(VBOX_PATH_QT4)/lib/ to /opt/VirtualBox/$(VBOX_SI_ARCH)/
     416# List of Qt shared libs that we need to copy from $(VBOX_PATH_QT)/lib/ to /opt/VirtualBox/$(VBOX_SI_ARCH)/
    417417# so that we can run VBoxQtConfig.
    418418SOLARIS_FILE_LIST_VARS += SOLARIS_QTLIBS
    … …  
    420420SOLARIS_QTLIBS.STRIP   := no
    421421SOLARIS_QTLIBS.MODE    := 0644
    422 SOLARIS_QTLIBS.SRC     := $(VBOX_PATH_QT4)/lib
     422SOLARIS_QTLIBS.SRC     := $(VBOX_PATH_QT)/lib
    423423SOLARIS_QTLIBS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)
    424424SOLARIS_QTLIBS =
    … …  
    540540                $(VBOX_PATH_SOL_INST_SRC)/vbox.pkginfo \
    541541                \
    542                 $(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_ORACLE_QT),$(VBOX_PATH_QT4)/bin/qtconfig,) \
     542                $(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_ORACLE_QT),$(VBOX_PATH_QT)/bin/qtconfig,) \
    543543                $(if-expr defined(VBOX_WITH_ADDITIONS_PACKING),$(PATH_STAGE_BIN)/additions/VBoxGuestAdditions.iso,) \
    544544                $(if-expr !defined(VBOX_OSE) && defined(VBOX_WITH_VBOXSDL),$(PATH_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2,) \
    … …  
    605605        $(if-expr defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_ORACLE_QT)\
    606606        ,$(INSTALL) -m 0755 \
    607                 $(VBOX_PATH_QT4)/bin/qtconfig   $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/VBoxQtconfig,)
     607                $(VBOX_PATH_QT)/bin/qtconfig    $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/VBoxQtconfig,)
    608608
    609609        $(if-expr defined(VBOX_WITH_QTGUI) \
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette