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

Timestamp:

Nov 11, 2010 6:42:54 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: do it right

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -542 +542 @@
     int h = 2 * mTwBootOrder->frameWidth();
     int w = h;
-#if defined(Q_WS_MAC) && (QT_VERSION < 0x040700)
+#if QT_VERSION < 0x040700
+# ifdef Q_WS_MAC
     int left, top, right, bottom;
     mTwBootOrder->getContentsMargins (&left, &top, &right, &bottom);
     h += top + bottom;
     w += left + right;
-#else /* defined(Q_WS_MAC) && (QT_VERSION < 0x040700) */
+# else /* Q_WS_MAC */
     w += 4;
-#endif /* !(defined(Q_WS_MAC) && (QT_VERSION < 0x040700)) */
+# endif /* !Q_WS_MAC */
+#endif /* QT_VERSION < 0x040700 */
     mTwBootOrder->setFixedSize(
         iv->sizeHintForColumn(0) + w,