Attachment #181912 for bug #218748

Lines 175-181 Link Here

(-)Makefile (-1 / +3 lines)
175	.if ${PORT_OPTIONS:MQT4}	175	.if ${PORT_OPTIONS:MQT4}
176	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderAdditions.cpp \	176	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderAdditions.cpp \
177	${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderExtensionPack.cpp \	177	${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderExtensionPack.cpp \
178	${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_settings_global_UIGlobalSettingsNetworkDetailsHost.cpp	178	${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_settings_global_UIGlobalSettingsNetworkDetailsHost.cpp \
		179	${PATCHDIR}/extrapatch-src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp
		180
179	CONFIGURE_ARGS+= --enable-qt4	181	CONFIGURE_ARGS+= --enable-qt4
180	USE_QT4= corelib gui linguist_build moc_build network opengl	182	USE_QT4= corelib gui linguist_build moc_build network opengl
181	USE_QT4+= rcc_build uic_build	183	USE_QT4+= rcc_build uic_build




--- src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp.orig	2017-04-19 16:51:18 UTC
+++ src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp
@@ -29,7 +29,9 @@
 # include <QToolButton>
 # include <QStateMachine>
 # include <QPainter>
+# if QT_VERSION >= 0x050000
 # include <QWindow>
+# endif
 # ifdef VBOX_WS_X11
 #  include <QWindowStateChangeEvent>
 # endif
@@ -404,7 +406,7 @@ Qt::WindowFlags UIMiniToolBar::defaultWi
     /* Not everywhere: */
     Q_UNUSED(geometryType);
 
-#ifdef VBOX_WS_X11
+#ifdef VBOX_WS_X11 && # QT_VERSION >= 0x050000
     /* Depending on current WM: */
     switch (vboxGlobal().typeOfWindowManager())
     {
@@ -614,10 +616,12 @@ void UIMiniToolBar::sltHide()
 
 void UIMiniToolBar::sltShow()
 {
+# if QT_VERSION >= 0x050000
     LogRel2(("GUI: UIMiniToolBar::sltShow\n"));
 
     /* Update transience: */
     sltAdjustTransience();
+#endif
 
 #if defined(VBOX_WS_MAC)
 
@@ -806,8 +810,10 @@ void UIMiniToolBar::sltAdjust()
 #endif
 }
 
+
 void UIMiniToolBar::sltAdjustTransience()
 {
+# if QT_VERSION >= 0x050000
     // WORKAROUND:
     // Make sure win id is generated,
     // else Qt5 can crash otherwise.
@@ -816,8 +822,10 @@ void UIMiniToolBar::sltAdjustTransience(
 
     /* Add the transience dependency: */
     windowHandle()->setTransientParent(m_pParent->windowHandle());
+#endif
 }
 
+
 void UIMiniToolBar::prepare()
 {
     /* Install event-filters: */

Return to bug 218748

Line 0 Link Here

(-)files/extrapatch-src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp (+56 lines)
	1	--- src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp.orig 2017-04-19 16:51:18 UTC
	2	+++ src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp
	3	@@ -29,7 +29,9 @@
	4	# include <QToolButton>
	5	# include <QStateMachine>
	6	# include <QPainter>
	7	+# if QT_VERSION >= 0x050000
	8	# include <QWindow>
	9	+# endif
	10	# ifdef VBOX_WS_X11
	11	# include <QWindowStateChangeEvent>
	12	# endif
	13	@@ -404,7 +406,7 @@ Qt::WindowFlags UIMiniToolBar::defaultWi
	14	/* Not everywhere: */
	15	Q_UNUSED(geometryType);
	16
	17	-#ifdef VBOX_WS_X11
	18	+#ifdef VBOX_WS_X11 && # QT_VERSION >= 0x050000
	19	/* Depending on current WM: */
	20	switch (vboxGlobal().typeOfWindowManager())
	21	{
	22	@@ -614,10 +616,12 @@ void UIMiniToolBar::sltHide()
	23
	24	void UIMiniToolBar::sltShow()
	25	{
	26	+# if QT_VERSION >= 0x050000
	27	LogRel2(("GUI: UIMiniToolBar::sltShow\n"));
	28
	29	/* Update transience: */
	30	sltAdjustTransience();
	31	+#endif
	32
	33	#if defined(VBOX_WS_MAC)
	34
	35	@@ -806,8 +810,10 @@ void UIMiniToolBar::sltAdjust()
	36	#endif
	37	}
	38
	39	+
	40	void UIMiniToolBar::sltAdjustTransience()
	41	{
	42	+# if QT_VERSION >= 0x050000
	43	// WORKAROUND:
	44	// Make sure win id is generated,
	45	// else Qt5 can crash otherwise.
	46	@@ -816,8 +822,10 @@ void UIMiniToolBar::sltAdjustTransience(
	47
	48	/* Add the transience dependency: */
	49	windowHandle()->setTransientParent(m_pParent->windowHandle());
	50	+#endif
	51	}
	52
	53	+
	54	void UIMiniToolBar::prepare()
	55	{
	56	/* Install event-filters: */