vbox的更動 59509 路徑 trunk/src/VBox/HostServices

時間撮記:

2016-1-28 下午01:45:12 (9 年 以前)

作者:

vboxsync

訊息:

FE/Qt: Qt5 migration (part 79): Preparing Qt5 tool: Patching Makefiles to be able to build components with Qt5 using VBOX_WITH_QTGUI_V5 flag.

檔案:

• trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk (修改) (2 筆差異)

trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

@@ -418 +418 @@
  ifneq ($(KBUILD_TARGET),darwin)
   ifdef VBOX_WITH_VIDEOHWACCEL
-   USES += qt4
+   ifeq ($(VBOX_WITH_QTGUI_V5),)
+    USES += qt4
+   else # VBOX_WITH_QTGUI_V5
+    USES += qt5
+   endif # VBOX_WITH_QTGUI_V5
   endif
   PROGRAMS += VBoxTestOGL
@@ -437 +441 @@
   ifdef VBOX_WITH_VIDEOHWACCEL
    VBoxTestOGL_QT_MODULES     += Core Gui OpenGL
+   ifneq ($(VBOX_WITH_QTGUI_V5),)
+    # Qt5 requires additional modules:
+    VBoxTestOGL_QT_MODULES += Widgets
+   endif # VBOX_WITH_QTGUI_V5
    VBoxTestOGL_LDFLAGS.darwin += -framework OpenGL
    VBoxTestOGL_LIBS.win       += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib