VirtualBox

Changeset 60072 in vbox for trunk/src


Ignore:
Timestamp:
Mar 17, 2016 12:18:23 PM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
106066
Message:

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

Location:
trunk/src/VBox
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Debugger/Makefile.kmk

    r59509 r60072  
    9090# Debugger GUI component (Qt4).
    9191#
    92 ifeq ($(VBOX_WITH_QTGUI_V5),)
     92ifndef VBOX_WITH_QTGUI_V5
    9393 USES += qt4
    9494else # VBOX_WITH_QTGUI_V5
    … …  
    100100VBoxDbg_INCS = .
    101101VBoxDbg_QT_MODULES = Core Gui
    102 ifneq ($(VBOX_WITH_QTGUI_V5),)
     102ifdef VBOX_WITH_QTGUI_V5
    103103 # Qt5 requires additional modules:
    104104 VBoxDbg_QT_MODULES += Widgets
    … …  
    126126PROGRAMS += tstVBoxDbg
    127127tstVBoxDbg_TEMPLATE     = VBOXQTGUIEXE
    128 ifeq ($(VBOX_WITH_QTGUI_V5),)
     128ifndef VBOX_WITH_QTGUI_V5
    129129 tstVBoxDbg_USES         = qt4
    130130 tstVBoxDbg_QTTOOL       = QT4
    … …  
    134134endif # VBOX_WITH_QTGUI_V5
    135135tstVBoxDbg_QT_MODULES   = Core Gui
    136 ifneq ($(VBOX_WITH_QTGUI_V5),)
     136ifdef VBOX_WITH_QTGUI_V5
    137137 # Qt5 requires additional modules:
    138138 tstVBoxDbg_QT_MODULES += Widgets
     139 tstVBoxDbg_LIBS.linux   += xcb
     140 tstVBoxDbg_LIBS.solaris += xcb
     141 tstVBoxDbg_LIBS.freebsd += xcb
    139142endif # VBOX_WITH_QTGUI_V5
    140143tstVBoxDbg_SOURCES      = testcase/tstVBoxDbg.cpp

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

    r59870 r60072  
    9292# VirtualBox - The GUI program.
    9393#
    94 ifeq ($(VBOX_WITH_QTGUI_V5),)
     94ifndef VBOX_WITH_QTGUI_V5
    9595 USES += qt4
    9696else # VBOX_WITH_QTGUI_V5
    … …  
    115115 VirtualBox_DEFS.darwin += VBOX_WITH_ICHAT_THEATER
    116116endif
    117 ifneq ($(VBOX_WITH_QTGUI_V5),)
     117ifdef VBOX_WITH_QTGUI_V5
    118118 # These important for us Qt4 defines missed in Qt5:
    119119 VirtualBox_DEFS.linux     += Q_WS_X11
    … …  
    234234VirtualBox_LIBS.freebsd += Xinerama
    235235
    236 ifneq ($(VBOX_WITH_QTGUI_V5),)
     236ifdef VBOX_WITH_QTGUI_V5
    237237 # No Qt5 without Xcb under X11:
    238238 VirtualBox_LIBS.linux   += xcb
    … …  
    859859# (The include directory and lib/framework for each module will be added by the Qt4 unit.)
    860860VirtualBox_QT_MODULES = Core Gui
    861 ifneq ($(VBOX_WITH_QTGUI_V5),)
     861ifdef VBOX_WITH_QTGUI_V5
    862862 # Qt5 requires additional modules:
    863863 VirtualBox_QT_MODULES += Widgets PrintSupport
    … …  
    10781078        $(PATH_ROOT)/src/VBox/Artwork/darwin/virtualbox-hdd.icns=>Resources/virtualbox-hdd.icns
    10791079
    1080 ifneq ($(VBOX_WITH_QTGUI_V5),)
     1080ifdef VBOX_WITH_QTGUI_V5
    10811081 # Qt5 requires qt.conf on Mac OS X:
    10821082 VirtualBox.app_SOURCES += \
    … …  
    11961196 PROGRAMS += tstSSLCertDownloads
    11971197 tstSSLCertDownloads_TEMPLATE   = VBOXQTGUIEXE
    1198  ifeq ($(VBOX_WITH_QTGUI_V5),)
     1198 ifndef VBOX_WITH_QTGUI_V5
    11991199  tstSSLCertDownloads_USES       = qt4
    12001200  tstSSLCertDownloads_QTTOOL     = QT4

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

    r59743 r60072  
    686686
    687687# elif defined(Q_WS_X11)
    688 #  pragma GCC diagnostic push
    689 #  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     688//#  pragma GCC diagnostic push
     689//#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
    690690
    691691    /* Make sure it's generic XCB event: */
    … …  
    715715    }
    716716
    717 #  pragma GCC diagnostic pop
     717//#  pragma GCC diagnostic pop
    718718# else
    719719

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

    r59509 r60072  
    418418 ifneq ($(KBUILD_TARGET),darwin)
    419419  ifdef VBOX_WITH_VIDEOHWACCEL
    420    ifeq ($(VBOX_WITH_QTGUI_V5),)
     420   ifndef VBOX_WITH_QTGUI_V5
    421421    USES += qt4
    422422   else # VBOX_WITH_QTGUI_V5
    … …  
    441441  ifdef VBOX_WITH_VIDEOHWACCEL
    442442   VBoxTestOGL_QT_MODULES     += Core Gui OpenGL
    443    ifneq ($(VBOX_WITH_QTGUI_V5),)
     443   ifdef VBOX_WITH_QTGUI_V5
    444444    # Qt5 requires additional modules:
    445445    VBoxTestOGL_QT_MODULES += Widgets
     446    VBoxTestOGL_LIBS.linux   += xcb
     447    VBoxTestOGL_LIBS.solaris += xcb
     448    VBoxTestOGL_LIBS.freebsd += xcb
    446449   endif # VBOX_WITH_QTGUI_V5
    447450   VBoxTestOGL_LDFLAGS.darwin += -framework OpenGL

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

    r59970 r60072  
    3737VBOX_PATH_DIST_OTHER = $(error VBOX_PATH_DIST_OTHER used in a non-combined package deal)
    3838
    39 ifeq ($(VBOX_WITH_QTGUI_V5),)
     39ifndef VBOX_WITH_QTGUI_V5
    4040 VBOX_QT_VERSION_MAJOR = 4
    4141 PATH_SDK_QT = $(PATH_SDK_QT4)
    … …  
    517517        MacOS/VBoxEFI64.fd
    518518endif
    519 ifeq ($(VBOX_WITH_QTGUI_V5),)
     519ifndef VBOX_WITH_QTGUI_V5
    520520 VBOX_DI_VBAPP_MISC_FILES += \
    521521        Frameworks/QtGui$(VBOX_QT_INFIX).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/Resources/qt_menu.nib/classes.nib \
    … …  
    714714                        $(VBOX_PATH_VBOX_APP_TMP)/Contents/$(f)$(NLTAB) )
    715715endif
    716 ifneq ($(VBOX_WITH_QTGUI_V5),)
     716ifdef VBOX_WITH_QTGUI_V5
    717717        $(QUIET)$(APPEND) $(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/qt.conf "[Paths]"
    718718        $(QUIET)$(APPEND) $(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/qt.conf "Prefix =" /Applications/VirtualBox.app/Contents

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

    r59468 r60072  
    249249endif
    250250
    251 # Qt4 GUI
     251# Qt GUI
    252252ifdef VBOX_WITH_QTGUI
    253253 include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
    … …  
    256256        VirtualBox \
    257257        $(if $(VBOX_WITH_HARDENING),VirtualBox.so) \
    258         $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so DbgPlugInDiggers.so)
    259  VBOX_LNX_NO_STRIP += \
    260         virtualbox.desktop \
    261         virtualbox.xml \
    262         $(VBOX_LICENSE_FILES) \
     258        $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so DbgPlugInDiggers.so)
     259 VBOX_LNX_NO_STRIP += \
     260        virtualbox.desktop \
     261        virtualbox.xml \
     262        $(VBOX_LICENSE_FILES) \
    263263        $(if $(VBOX_WITH_ORACLE_QT),$(notdir $(wildcard $(PATH_STAGE_BIN)/lib*VBox*)),) \
    264         $(if $(VBOX_WITH_ORACLE_QT),accessible/libqtaccessiblewidgets.so,) \
    265264        $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm) \
    266         icons
     265        icons
     266 ifndef VBOX_WITH_QTGUI_V5
     267  VBOX_LNX_NO_STRIP += \
     268        $(if $(VBOX_WITH_ORACLE_QT),accessible/libqtaccessiblewidgets.so,)
     269 else # VBOX_WITH_QTGUI_V5
     270  VBOX_LNX_NO_STRIP += \
     271        platforms/libqxcb.so
     272 endif # VBOX_WITH_QTGUI_v5
    267273endif
    268274
    … …  
    508514        archive/components \
    509515        archive/nls \
    510         $(if $(VBOX_WITH_ORACLE_QT),archive/accessible,) \
     516        $(if $(VBOX_WITH_ORACLE_QT),\
     517          archive/accessible,) \
     518        $(if $(VBOX_WITH_QTGUI_V5),\
     519          archive/platforms,) \
    511520        $(if $(VBOX_WITH_PYTHON),\
    512521          archive/sdk/installer \

  • trunk/src/VBox/Main/Makefile.kmk

    r59923 r60072  
    969969ifeq ($(KBUILD_TARGET).$(VBOX_VCC_CRT_TYPE),win.d)
    970970 LIBRARIES += VBoxCOM-GUI
    971  ifeq ($(VBOX_WITH_QTGUI_V5),)
     971 ifndef VBOX_WITH_QTGUI_V5
    972972  USES += qt4
    973973 else # VBOX_WITH_QTGUI_V5
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