Attachment 181905 Details for Bug 218748 – patch_svn.diff

[patch] patch_svn.diff

patch_svn.diff (text/plain), 2.14 KB, created by Vladimir Omelchuk on 2017-04-19 14:30:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Omelchuk

Created: 2017-04-19 14:30:14 UTC

Size: 2.14 KB

patch

obsolete

>Index: files/patch-src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp
>===================================================================
>--- files/patch-src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp	(nonexistent)
>+++ files/patch-src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp	(working copy)
>@@ -0,0 +1,57 @@
>+--- src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp.orig	2017-04-18 09:53:23 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,18 +810,21 @@ void UIMiniToolBar::sltAdjust()
>+ #endif
>+ }
>+ 
>++
>+ void UIMiniToolBar::sltAdjustTransience()
>+ {
>++    # if QT_VERSION >= 0x050000
>+     // WORKAROUND:
>+     // Make sure win id is generated,
>+     // else Qt5 can crash otherwise.
>+     winId();
>+     m_pParent->winId();
>+-
>+     /* Add the transience dependency: */
>+     windowHandle()->setTransientParent(m_pParent->windowHandle());
>++    #endif
>+ }
>+ 
>++
>+ void UIMiniToolBar::prepare()
>+ {
>+     /* Install event-filters: */
>
>Property changes on: files/patch-src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 218748: 181888 | 181890 | 181897 | 181905 | 181912 | 181913