linux

Timestamp:

May 24, 2017 3:43:59 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

115727

Message:

drop VBOX_WITH_QTGUI_V5 and friends

Location:

trunk/src/VBox/Installer/linux

Files:

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

-              r66049
+              r67067
         $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm) \
         icons
+ ifndef VBOX_WITH_QTGUI_V5
+  VBOX_LNX_NO_STRIP += \
+        $(if $(VBOX_WITH_ORACLE_QT),accessible/libqtaccessiblewidgets.so,)
+ else # VBOX_WITH_QTGUI_V5
+  VBOX_LNX_NO_STRIP += \
+ VBOX_LNX_NO_STRIP += \
         $(if $(VBOX_WITH_ORACLE_QT),$(VBOX_QT_PLUGINS)) \
         $(addprefix legacy/,$(VBOX_QT_LEGACY_LIBS))
- endif # VBOX_WITH_QTGUI_V5
 endif
 …
         archive/nls \
         $(if $(VBOX_WITH_UNATTENDED),archive/unattended_templates,) \
+        $(if $(VBOX_WITH_ORACLE_QT),$(if $(VBOX_WITH_QTGUI_V5),,\
+          archive/accessible),) \
+        $(if $(VBOX_WITH_QTGUI_V5),\
+        $(if $(VBOX_WITH_ORACLE_QT), \
           archive/plugins/platforms \
           archive/legacy,) \

-              r65949
+              r67067
 Maintainer: Oracle Corporation <[email protected]>
 Standards-Version: 3.2.1
 Build-Depends: debhelper (>= 5), libz-dev, libssl-dev, libqt4-dev,
   libqt4-opengl-dev, libsdl1.2-dev, uuid-dev, libxcursor-dev,
+Build-Depends: debhelper (>= 5), libz-dev, libssl-dev,
+  libsdl1.2-dev, uuid-dev, libxcursor-dev,
   libidl-dev, libpam0g-dev, iasl, xsltproc, linux-headers-generic,
   wine, java2-runtime, lsb-release, g++-multilib [amd64],

-              r66822
+              r67067
 endif
-# Depend on Qt 5.6 or later otherwise we use Qt 5.3.2 from Debian 8.
 cfg_flags := $(if $(NOQT),--disable-qt,) \
-             $(if $(NOQT),,--with-qt5-major=5 --with-qt5-minor=6) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
              $(if $(HEADLESS),--build-headless,) \

Note: See TracChangeset for help on using the changeset viewer.