svn commit: r438899 - in head/emulators/virtualbox-ose: . files

[Jung-uk Kim]

Author: jkim
Date: Wed Apr 19 18:10:34 2017
New Revision: 438899
URL: https://svnweb.freebsd.org/changeset/ports/438899

Log:
  - Fix build with option QT4.
  - Warn users Qt4 support may be removed in the future.
  
  PR:		218748
  Submitted by:	w dot schwarzenfeld at utanet dot at (initial)

Added:
  head/emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp   (contents, props changed)
Modified:
  head/emulators/virtualbox-ose/Makefile

Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile	Wed Apr 19 17:53:14 2017	(r438898)
+++ head/emulators/virtualbox-ose/Makefile	Wed Apr 19 18:10:34 2017	(r438899)
@@ -175,10 +175,13 @@ VBOX_WITH_QT=	1
 .if ${PORT_OPTIONS:MQT4}
 EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderAdditions.cpp \
 		${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderExtensionPack.cpp \
-		${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_settings_global_UIGlobalSettingsNetworkDetailsHost.cpp
+		${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_settings_global_UIGlobalSettingsNetworkDetailsHost.cpp \
+		${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp
 CONFIGURE_ARGS+=	--enable-qt4
 USE_QT4=	corelib gui linguist_build moc_build network opengl
 USE_QT4+=	rcc_build uic_build
+WARNING=	"Qt4 support has been deprecated by the upstream.\
+		This option may be removed in the future without notice."
 .else
 CONFIGURE_ARGS+=	--enable-qt5
 USE_QT5=	buildtools_build core dbus gui linguist_build opengl

Added: head/emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp	Wed Apr 19 18:10:34 2017	(r438899)
@@ -0,0 +1,40 @@
+--- src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp.orig	2017-04-18 09:53:23.000000000 +0000
++++ src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp	2017-04-19 17:26:36.194563000 +0000
+@@ -29,7 +29,9 @@
+ # include <QToolButton>
+ # include <QStateMachine>
+ # include <QPainter>
+-# include <QWindow>
++# if QT_VERSION >= 0x050000
++#  include <QWindow>
++# endif
+ # ifdef VBOX_WS_X11
+ #  include <QWindowStateChangeEvent>
+ # endif
+@@ -616,8 +618,10 @@ void UIMiniToolBar::sltShow()
+ {
+     LogRel2(("GUI: UIMiniToolBar::sltShow\n"));
+ 
++#if QT_VERSION >= 0x050000
+     /* Update transience: */
+     sltAdjustTransience();
++#endif
+ 
+ #if defined(VBOX_WS_MAC)
+ 
+@@ -806,6 +810,7 @@ void UIMiniToolBar::sltAdjust()
+ #endif
+ }
+ 
++#if QT_VERSION >= 0x050000
+ void UIMiniToolBar::sltAdjustTransience()
+ {
+     // WORKAROUND:
+@@ -817,6 +822,7 @@ void UIMiniToolBar::sltAdjustTransience(
+     /* Add the transience dependency: */
+     windowHandle()->setTransientParent(m_pParent->windowHandle());
+ }
++#endif
+ 
+ void UIMiniToolBar::prepare()
+ {