Changeset 59335 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 14, 2016 8:32:28 AM (9 years ago)

Author:

vboxsync

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

105007

Message:

FE/Qt: Qt5 migration (part 49): No need for keep-aspect-ratio feature for scaling mode with Qt5.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale

Files:

• UIMachineWindowScale.cpp (modified) (2 diffs)
• UIMachineWindowScale.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -200 +200 @@
 
 #ifdef Q_WS_WIN
+# if QT_VERSION < 0x050000
 bool UIMachineWindowScale::winEvent(MSG *pMessage, long *pResult)
 {
@@ -244 +245 @@
     return UIMachineWindow::winEvent(pMessage, pResult);
 }
+# endif /* QT_VERSION < 0x050000 */
 #endif /* Q_WS_WIN */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.h

@@ -57 +57 @@
     bool event(QEvent *pEvent);
 #ifdef Q_WS_WIN
-    /** Windows: Common native @a pEvent handler. */
+# if QT_VERSION < 0x050000
+    /** Qt4: Win: Handles all native messages. */
     bool winEvent(MSG *pMessage, long *pResult);
+# endif /* QT_VERSION < 0x050000 */
 #endif /* Q_WS_WIN */