Changeset 94033 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 1, 2022 11:34:06 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: qt6: The result argument of QWidget::nativeEvent changes from a long to qintptr pointer in 6. bugref:9898

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/UIMachineView.cpp (modified) (1 diff)
• settings/editors/UIHostComboEditor.cpp (modified) (1 diff)
• settings/editors/UIHostComboEditor.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -103 +103 @@
 
     /** Redirects all the native events to parent. */
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool nativeEventFilter(const QByteArray &eventType, void *pMessage, qintptr * /* pResult */)
+#else
     bool nativeEventFilter(const QByteArray &eventType, void *pMessage, long * /* pResult */)
+#endif
     {
         return m_pParent->nativeEventPreprocessor(eventType, pMessage);

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIHostComboEditor.cpp

@@ -620 +620 @@
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool UIHostComboEditorPrivate::nativeEvent(const QByteArray &eventType, void *pMessage, qintptr *pResult)
+#else
 bool UIHostComboEditorPrivate::nativeEvent(const QByteArray &eventType, void *pMessage, long *pResult)
+#endif
 {
 # if defined(VBOX_WS_MAC)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIHostComboEditor.h

@@ -191 +191 @@
 
     /** Handles native events. */
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    virtual bool nativeEvent(const QByteArray &eventType, void *pMessage, qintptr *pResult) RT_OVERRIDE;
+#else
     virtual bool nativeEvent(const QByteArray &eventType, void *pMessage, long *pResult) RT_OVERRIDE;
+#endif
 
     /** Handles key-press @a pEvent. */