FreeBSD Bugzilla – Attachment 181897 Details for
Bug 218748
emulators/virtualbox-ose (5.1.18): Doesn't upgrading to 5.1.20
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
proposed_patch-UIMiniToolBar.cpp
patch-UIMiniToolBar.cpp (text/plain), 1.37 KB, created by
Walter Schwarzenfeld
on 2017-04-19 13:13:10 UTC
(
hide
)
Description:
proposed_patch-UIMiniToolBar.cpp
Filename:
MIME Type:
Creator:
Walter Schwarzenfeld
Created:
2017-04-19 13:13:10 UTC
Size:
1.37 KB
patch
obsolete
>--- src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp.orig 2017-04-19 11:22:57 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: */
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 218748
:
181888
|
181890
|
181897
|
181905
|
181912
|
181913