diff options
Diffstat (limited to 'src/widgets/styles/qcommonstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 8e750735f6..e6080c22c4 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -5200,8 +5200,8 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti /*! \internal */ -QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, - const QWidget *widget) const +QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option, + const QWidget *widget) const { QIcon icon; const bool rtl = (option && option->direction == Qt::RightToLeft) || (!option && QApplication::isRightToLeft()); @@ -5338,17 +5338,17 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons break; case SP_ArrowForward: if (rtl) - return standardIconImplementation(SP_ArrowLeft, option, widget); - return standardIconImplementation(SP_ArrowRight, option, widget); + return QCommonStyle::standardIcon(SP_ArrowLeft, option, widget); + return QCommonStyle::standardIcon(SP_ArrowRight, option, widget); case SP_ArrowBack: if (rtl) - return standardIconImplementation(SP_ArrowRight, option, widget); - return standardIconImplementation(SP_ArrowLeft, option, widget); + return QCommonStyle::standardIcon(SP_ArrowRight, option, widget); + return QCommonStyle::standardIcon(SP_ArrowLeft, option, widget); case SP_FileLinkIcon: { QIcon linkIcon = QIcon::fromTheme(QLatin1String("emblem-symbolic-link")); if (!linkIcon.isNull()) { - QIcon baseIcon = standardIconImplementation(SP_FileIcon, option, widget); + QIcon baseIcon = QCommonStyle::standardIcon(SP_FileIcon, option, widget); const QList<QSize> sizes = baseIcon.availableSizes(QIcon::Normal, QIcon::Off); for (int i = 0 ; i < sizes.size() ; ++i) { int size = sizes[i].width(); @@ -5365,7 +5365,7 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons { QIcon linkIcon = QIcon::fromTheme(QLatin1String("emblem-symbolic-link")); if (!linkIcon.isNull()) { - QIcon baseIcon = standardIconImplementation(SP_DirIcon, option, widget); + QIcon baseIcon = QCommonStyle::standardIcon(SP_DirIcon, option, widget); const QList<QSize> sizes = baseIcon.availableSizes(QIcon::Normal, QIcon::Off); for (int i = 0 ; i < sizes.size() ; ++i) { int size = sizes[i].width(); @@ -5493,9 +5493,9 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/newdirectory-128.png"), QSize(128, 128)); break; case SP_FileDialogBack: - return standardIconImplementation(SP_ArrowBack, option, widget); + return QCommonStyle::standardIcon(SP_ArrowBack, option, widget); case SP_FileDialogToParent: - return standardIconImplementation(SP_ArrowUp, option, widget); + return QCommonStyle::standardIcon(SP_ArrowUp, option, widget); case SP_FileDialogDetailedView: icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewdetailed-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewdetailed-32.png"), QSize(32, 32)); @@ -5573,12 +5573,12 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons break; case SP_ArrowForward: if (rtl) - return standardIconImplementation(SP_ArrowLeft, option, widget); - return standardIconImplementation(SP_ArrowRight, option, widget); + return QCommonStyle::standardIcon(SP_ArrowLeft, option, widget); + return QCommonStyle::standardIcon(SP_ArrowRight, option, widget); case SP_ArrowBack: if (rtl) - return standardIconImplementation(SP_ArrowRight, option, widget); - return standardIconImplementation(SP_ArrowLeft, option, widget); + return QCommonStyle::standardIcon(SP_ArrowRight, option, widget); + return QCommonStyle::standardIcon(SP_ArrowLeft, option, widget); case SP_ArrowLeft: icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/left-16.png"), QSize(16, 16)); icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/left-32.png"), QSize(32, 32)); @@ -5767,6 +5767,16 @@ QPixmap QCommonStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &p /*! \reimp */ +int QCommonStyle::layoutSpacing(QSizePolicy::ControlType /* control1 */, QSizePolicy::ControlType /* control2 */, + Qt::Orientation /* orientation */, const QStyleOption * /* option */, + const QWidget * /* widget */) const +{ + return -1; +} + +/*! + \reimp +*/ void QCommonStyle::polish(QPalette &pal) { QStyle::polish(pal); |