vbox的更動 60072 路徑 trunk/src/VBox/Debugger

時間撮記:

2016-3-17 下午12:18:23 (9 年 以前)

作者:

vboxsync

訊息:

'xcb' for Qt5 on X11 and make it more obvious if VBOX_WITH_QTGUI_V5 is active or not

檔案:

• trunk/src/VBox/Debugger/Makefile.kmk (修改) (4 筆差異)

trunk/src/VBox/Debugger/Makefile.kmk

@@ -90 +90 @@
 # Debugger GUI component (Qt4).
 #
-ifeq ($(VBOX_WITH_QTGUI_V5),)
+ifndef VBOX_WITH_QTGUI_V5
  USES += qt4
 else # VBOX_WITH_QTGUI_V5
@@ -100 +100 @@
 VBoxDbg_INCS = .
 VBoxDbg_QT_MODULES = Core Gui
-ifneq ($(VBOX_WITH_QTGUI_V5),)
+ifdef VBOX_WITH_QTGUI_V5
  # Qt5 requires additional modules:
  VBoxDbg_QT_MODULES += Widgets
@@ -126 +126 @@
 PROGRAMS += tstVBoxDbg
 tstVBoxDbg_TEMPLATE     = VBOXQTGUIEXE
-ifeq ($(VBOX_WITH_QTGUI_V5),)
+ifndef VBOX_WITH_QTGUI_V5
  tstVBoxDbg_USES         = qt4
  tstVBoxDbg_QTTOOL       = QT4
@@ -134 +134 @@
 endif # VBOX_WITH_QTGUI_V5
 tstVBoxDbg_QT_MODULES   = Core Gui
-ifneq ($(VBOX_WITH_QTGUI_V5),)
+ifdef VBOX_WITH_QTGUI_V5
  # Qt5 requires additional modules:
  tstVBoxDbg_QT_MODULES += Widgets
+ tstVBoxDbg_LIBS.linux   += xcb
+ tstVBoxDbg_LIBS.solaris += xcb
+ tstVBoxDbg_LIBS.freebsd += xcb
 endif # VBOX_WITH_QTGUI_V5
 tstVBoxDbg_SOURCES      = testcase/tstVBoxDbg.cpp