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

時間撮記:

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/Frontends/VirtualBox

檔案:

• Makefile.kmk (修改) (6 筆差異)
• src/widgets/UIHostComboEditor.cpp (修改) (2 筆差異)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -92 +92 @@
 # VirtualBox - The GUI program.
 #
-ifeq ($(VBOX_WITH_QTGUI_V5),)
+ifndef VBOX_WITH_QTGUI_V5
  USES += qt4
 else # VBOX_WITH_QTGUI_V5
@@ -115 +115 @@
  VirtualBox_DEFS.darwin += VBOX_WITH_ICHAT_THEATER
 endif
-ifneq ($(VBOX_WITH_QTGUI_V5),)
+ifdef VBOX_WITH_QTGUI_V5
  # These important for us Qt4 defines missed in Qt5:
  VirtualBox_DEFS.linux     += Q_WS_X11
@@ -234 +234 @@
 VirtualBox_LIBS.freebsd += Xinerama
 
-ifneq ($(VBOX_WITH_QTGUI_V5),)
+ifdef VBOX_WITH_QTGUI_V5
  # No Qt5 without Xcb under X11:
  VirtualBox_LIBS.linux   += xcb
@@ -859 +859 @@
 # (The include directory and lib/framework for each module will be added by the Qt4 unit.)
 VirtualBox_QT_MODULES = Core Gui
-ifneq ($(VBOX_WITH_QTGUI_V5),)
+ifdef VBOX_WITH_QTGUI_V5
  # Qt5 requires additional modules:
  VirtualBox_QT_MODULES += Widgets PrintSupport
@@ -1078 +1078 @@
         $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-hdd.icns=>Resources/virtualbox-hdd.icns
 
-ifneq ($(VBOX_WITH_QTGUI_V5),)
+ifdef VBOX_WITH_QTGUI_V5
  # Qt5 requires qt.conf on Mac OS X:
  VirtualBox.app_SOURCES += \
@@ -1196 +1196 @@
  PROGRAMS += tstSSLCertDownloads
  tstSSLCertDownloads_TEMPLATE   = VBOXQTGUIEXE
- ifeq ($(VBOX_WITH_QTGUI_V5),)
+ ifndef VBOX_WITH_QTGUI_V5
   tstSSLCertDownloads_USES       = qt4
   tstSSLCertDownloads_QTTOOL     = QT4

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp

@@ -686 +686 @@
 
 # elif defined(Q_WS_X11)
-#  pragma GCC diagnostic push
-#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+//#  pragma GCC diagnostic push
+//#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
     /* Make sure it's generic XCB event: */
@@ -715 +715 @@
     }
 
-#  pragma GCC diagnostic pop
+//#  pragma GCC diagnostic pop
 # else