VirtualBox

Changeset 58948 in vbox


Ignore:
Timestamp:
Dec 2, 2015 1:12:14 PM (9 years ago)
Author:
vboxsync
Message:

FE/Qt: Qt5 migration (part 27): No styles in Qt5 by default, they moved to modules and we are not yet sure they are still required.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/precomp.h

    r58444 r58948  
    201201#include <QWaitCondition>
    202202#include <QWidget>
    203 #include <QWindowsStyle>
     203//#include <QWindowsStyle> - only used twice
    204204//#include <QWindowsVistaStyle> - only used once
    205205#include <QWizard>
  • trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp

    r56217 r58948  
    2525# include <QMenu>
    2626# include <QScrollBar>
    27 # include <QWindowsStyle>
    2827# include <QPointer>
    2928# include <QApplication>
     
    4645
    4746#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
     47
     48/* Qt includes: */
     49#if QT_VERSION < 0x050000
     50# include <QWindowsStyle>
     51#endif /* QT_VERSION < 0x050000 */
    4852
    4953
     
    372376    mTreeWidget->header()->hide();
    373377
     378#if QT_VERSION < 0x050000
    374379    /* The snapshots widget is not very useful if there are a lot
    375380     * of snapshots in a tree and the current Qt style decides not
     
    384389    connect (mTreeWidget, SIGNAL (destroyed (QObject *)), treeWidgetStyle, SLOT (deleteLater()));
    385390// #endif
     391#endif /* QT_VERSION < 0x050000 */
    386392
    387393    /* Cache pixmaps: */
  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp

    r52733 r58948  
    2323# include <QLayout>
    2424# include <QMainWindow>
    25 # include <QWindowsStyle>
    2625
    2726/* GUI includes: */
     
    3332#endif /* Q_WS_MAC */
    3433
    35 #include <QCleanlooksStyle>
     34/* Qt includes: */
     35#if QT_VERSION < 0x050000
     36# include <QWindowsStyle>
     37# include <QCleanlooksStyle>
     38#endif /* QT_VERSION < 0x050000 */
    3639
    3740
     
    9093    setMovable(false);
    9194
     95#if QT_VERSION < 0x050000
    9296    /* Remove that ugly frame panel around the toolbar.
    9397     * Doing that currently for Cleanlooks & Windows styles. */
    94     if (qobject_cast <QCleanlooksStyle*>(QToolBar::style()) ||
    95         qobject_cast <QWindowsStyle*>(QToolBar::style()))
     98    if (qobject_cast <QWindowsStyle*>(QToolBar::style()) ||
     99        qobject_cast <QCleanlooksStyle*>(QToolBar::style()))
    96100        setStyleSheet("QToolBar { border: 0px none black; }");
     101#endif /* QT_VERSION < 0x050000 */
    97102
    98103    /* Configure tool-bar' layout: */
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette