Changeset 91001 in vbox

Timestamp:

Aug 30, 2021 2:26:27 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8682: Remove rest of protections created for earlier workaround we had.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.h

-              r84696
+              r91001
 private slots:
-#if QT_VERSION == 0
-    /** Stupid moc does not warn if it cannot find headers! */
-    void QT_VERSION_NOT_DEFINED
-#else /* QT_VERSION != 0 */
     /** Handles @a pHostScreen adding. */
     void sltHostScreenAdded(QScreen *pHostScreen);
 …
     /** Handles host-screen work-area resize to passed @a availableGeometry. */
     void sltHandleHostScreenWorkAreaResized(const QRect &availableGeometry);
-#endif /* QT_VERSION != 0 */
 #if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)

-              r90795
+              r91001
     /** @name Common stuff.
       * @{ */
+#if QT_VERSION == 0
+        /** Stupid moc does not warn if it cannot find headers! */
+        void QT_VERSION_NOT_DEFINED
+#elif defined(VBOX_WS_X11)
+#ifdef VBOX_WS_X11
         /** Handles host-screen available-area change. */
         void sltHandleHostScreenAvailableAreaChange();
 #endif /* VBOX_WS_X11 */
+#endif
         /** Handles request to update actions. */

-              r85121
+              r91001
     virtual void sltMachineStateChanged();
-#if QT_VERSION == 0
-    /** Stupid moc does not warn if it cannot find headers! */
-    void QT_VERSION_NOT_DEFINED
-#else
     /** Finalises keyboard capture. */
     void sltFinaliseCaptureKeyboard();
-#endif
 protected:

Note: See TracChangeset for help on using the changeset viewer.