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

Timestamp:

May 19, 2016 1:54:00 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Qt5 migration (part 113): Solaris: Removing old styles not supported by Qt5.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/main.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -54 +54 @@
 #ifdef VBOX_WS_X11
 # ifdef Q_OS_SOLARIS
-#  include <QPlastiqueStyle>
+#  if QT_VERSION < 0x050000
+#   include <QPlastiqueStyle>
+#  endif /* QT_VERSION < 0x050000 */
 # endif /* Q_OS_SOLARIS */
 # ifndef Q_OS_SOLARIS
@@ -473 +475 @@
 
 # ifdef Q_OS_SOLARIS
+#  if QT_VERSION < 0x050000
         /* Use plastique look&feel for Solaris instead of the default motif (Qt 4.7.x): */
         QApplication::setStyle(new QPlastiqueStyle);
+#  else /* QT_VERSION >= 0x050000 */
+        a.setStyle("fusion");
+#  endif /* QT_VERSION >= 0x050000 */
 # endif /* Q_OS_SOLARIS */
 
@@ -599 +605 @@
 
 #ifdef Q_OS_SOLARIS
+# if QT_VERSION < 0x050000
         /* Use plastique look&feel for Solaris instead of the default motif (Qt 4.7.x): */
         QApplication::setStyle(new QPlastiqueStyle);
+#else /* QT_VERSION >= 0x050000 */
+        a.setStyle("fusion");
+# endif /* QT_VERSION >= 0x050000 */
 #endif /* Q_OS_SOLARIS */