Changeset 59510 in vbox

Timestamp:

Jan 28, 2016 2:01:42 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Qt5 migration (part 80): Preparing Qt5 tool: Some cleanup and update for r105287.

Location:

trunk

Files:

• Config.kmk (modified) (7 diffs)
• Makefile.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -5219 +5219 @@
    ifeq ($(VBOX_WITH_QTGUI_V5),)
     VBOX_PATH_QT := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*)))
-   else
+   else # VBOX_WITH_QTGUI_V5
     VBOX_PATH_QT := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
-   endif
+   endif # VBOX_WITH_QTGUI_V5
    ifeq ($(VBOX_PATH_QT),)
     ifneq ($(wildcard /Library/Frameworks/QtCore.framework),)
@@ -5232 +5232 @@
    ifeq ($(VBOX_WITH_QTGUI_V5),)
     VBOX_PATH_QT ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*))))
-   else
+   else # VBOX_WITH_QTGUI_V5
     VBOX_PATH_QT ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*))))
-   endif
+   endif # VBOX_WITH_QTGUI_V5
   else if1of ($(KBUILD_TARGET), linux solaris)
    ifeq ($(VBOX_WITH_QTGUI_V5),)
     VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*)))
-   else
+   else # VBOX_WITH_QTGUI_V5
     VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
-   endif
+   endif # VBOX_WITH_QTGUI_V5
    ifneq ($(VBOX_PATH_QT),)
     VBOX_WITH_ORACLE_QT = 1
@@ -5252 +5252 @@
    ifeq ($(VBOX_WITH_QTGUI_V5),)
     VBOX_PATH_QT_LIB      ?= /usr/lib/qt4
-   else
+   else # VBOX_WITH_QTGUI_V5
     VBOX_PATH_QT_LIB      ?= /usr/lib/qt5
-   endif
+   endif # VBOX_WITH_QTGUI_V5
   endif
  endif
@@ -5266 +5266 @@
  ifeq ($(VBOX_WITH_QTGUI_V5),)
   VBOX_QT_MOD = QtCore QtGui $(if $(VBOX_GUI_USE_QGL),QtOpenGL,)
- else
+ else # VBOX_WITH_QTGUI_V5
   ifeq ($(KBUILD_TARGET), darwin)
    VBOX_QT_MOD = \
@@ -5287 +5287 @@
       Qt5XcbQpa \
       Qt5X11Extras
-    endif
-    ifeq ($(KBUILD_TARGET), win)
+    else ifeq ($(KBUILD_TARGET), win)
      VBOX_QT_MOD += \
       Qt5WinExtras
-    endif
-  endif
- endif
+    endif # win
+  endif # linux freebsd netbsd openbsd solaris win
+ endif # VBOX_WITH_QTGUI_V5
 
  VBOX_QT_MOD_NAMES = $(foreach qtmod,$(VBOX_QT_MOD),$(qtmod)$(VBOX_QT_INFIX))
@@ -5317 +5316 @@
   TEMPLATE_VBOXQTGUIEXE_LRCTOOL = QT4
   TEMPLATE_VBOXQTGUIEXE_SDKS = QT4
- else
+ else # VBOX_WITH_QTGUI_V5
   TEMPLATE_VBOXQTGUIEXE_USES = qt5
   TEMPLATE_VBOXQTGUIEXE_QTTOOL = QT5
@@ -5325 +5324 @@
   TEMPLATE_VBOXQTGUIEXE_LRCTOOL = QT5
   TEMPLATE_VBOXQTGUIEXE_SDKS = QT5
- endif
+ endif # VBOX_WITH_QTGUI_V5
  TEMPLATE_VBOXQTGUIEXE_QT_INFIX = $(VBOX_QT_INFIX)
  TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS)

trunk/Makefile.kmk

@@ -214 +214 @@
    Frameworks/$(qtmod).framework/$(qtmod)=>Versions/5/$(qtmod) \
    Frameworks/$(qtmod).framework/Resources=>Versions/5/Resources)
- else # WIN || X11
+ else # win x11
   if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
    include $(KBUILD_PATH)/units/qt5.kmk
@@ -226 +226 @@
      qt5-bin_SOURCES += \
       $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(VBOX_PATH_QT_LIB)/$(qtmod).pdb)
-    endif
-   else # X11
+    endif # VBOX_WITH_QT_PDBS
+   else # x11
     INSTALLS += qt5-bin
     qt5-bin_MODE = 755
@@ -235 +235 @@
      $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(VBOX_PATH_QT_LIB)/lib$(qtmod)$(SUFF_DLL).5.5.1) \
      $(VBOX_PATH_QT)/plugins/platforms/libqxcb$(SUFF_DLL)=>platforms/libqxcb$(SUFF_DLL)
-   endif # X11
+   endif # x11
   endif # VBOX_WITH_ORACLE_QT || VBOX_WITH_QT_PAYLOAD
- endif # WIN || X11
+ endif # win x11
 endif # VBOX_WITH_QTGUI_V5