Hello community,
here is the log from the commit of package libqt5-qtstyleplugins for
openSUSE:Factory checked in at 2016-10-24 14:44:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtstyleplugins (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtstyleplugins.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtstyleplugins"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libqt5-qtstyleplugins/libqt5-qtstyleplugins.changes
2016-10-19 13:05:21.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtstyleplugins.new/libqt5-qtstyleplugins.changes
2016-10-24 14:44:58.000000000 +0200
@@ -1,0 +2,16 @@
+Mon Oct 24 11:18:06 UTC 2016 - [email protected]
+
+- Update to version 5.0.0+git20161022 (changes since
+ 5.0.0+git20161005):
+ * Remove usage of deprecated QStyleOption*V<N>.
+ * Add Q_DECL_OVERRIDE.
+ * Build the BB10 style only with Qt 5.7 or later.
+- Remove the conflict with libqt5-qtbase-platformtheme-gtk3 in
+ libqt5-qtstyleplugins-platformtheme-gtk2: it causes the gtk2
+ platform theme to practically never get installed.
+ The reason for the conflict in the first place is overrated
+ anyway: in order to get a segfault, a user would have to manually
+ make an envvar "QT_STYLE_OVERRIDE=gtk2" with also having Gtk3
+ Platform Theme triggered ("QT_QPA_PLATFORMTHEME=gtk3").
+
+-------------------------------------------------------------------
Old:
----
qtstyleplugins-opensource-src-5.0.0+git20161005.tar.xz
New:
----
qtstyleplugins-opensource-src-5.0.0+git20161022.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtstyleplugins.spec ++++++
--- /var/tmp/diff_new_pack.Z7Axcm/_old 2016-10-24 14:44:59.000000000 +0200
+++ /var/tmp/diff_new_pack.Z7Axcm/_new 2016-10-24 14:44:59.000000000 +0200
@@ -21,7 +21,7 @@
%define qt_version 5.7.0
%bcond_without gtk2
Name: libqt5-qtstyleplugins
-Version: 5.0.0+git20161005
+Version: 5.0.0+git20161022
Release: 0
Summary: Qt 5 Style Plugins
License: SUSE-LGPL-2.1-with-digia-exception-1.1
@@ -55,10 +55,6 @@
Group: Development/Libraries/C and C++
%requires_eq libQt5Gui5
Supplements: packageand(libQt5Gui5:libgtk-2_0-0)
-# Mixing QGtk2Style with the Gtk3 Platform Theme causes a segfault,
-# this should absolutely never happen, thus avoiding installation of both at
-# the same time.
-Conflicts: libqt5-qtbase-platformtheme-gtk3
%description platformtheme-gtk2
Qt 5 plugin for better integration with gtk-based desktop enviroments.
++++++ qtstyleplugins-opensource-src-5.0.0+git20161005.tar.xz ->
qtstyleplugins-opensource-src-5.0.0+git20161022.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/bb10style/qbb10brightstyle.h
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/bb10style/qbb10brightstyle.h
---
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/bb10style/qbb10brightstyle.h
2016-10-09 16:57:38.000000000 +0200
+++
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/bb10style/qbb10brightstyle.h
2016-10-24 14:15:11.000000000 +0200
@@ -46,15 +46,15 @@
QBB10BrightStyle();
~QBB10BrightStyle();
- void polish(QApplication *application);
- void polish(QWidget *widget);
+ void polish(QApplication *application) Q_DECL_OVERRIDE;
+ void polish(QWidget *widget) Q_DECL_OVERRIDE;
- QPalette standardPalette() const;
+ QPalette standardPalette() const Q_DECL_OVERRIDE;
void drawControl(ControlElement element, const QStyleOption *option,
- QPainter *painter, const QWidget *widget = 0) const;
+ QPainter *painter, const QWidget *widget = 0) const
Q_DECL_OVERRIDE;
void drawPrimitive(PrimitiveElement element, const QStyleOption *option,
- QPainter *painter, const QWidget *widget) const;
+ QPainter *painter, const QWidget *widget) const
Q_DECL_OVERRIDE;
};
QT_END_NAMESPACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/bb10style/qbb10darkstyle.h
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/bb10style/qbb10darkstyle.h
---
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/bb10style/qbb10darkstyle.h
2016-10-09 16:57:38.000000000 +0200
+++
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/bb10style/qbb10darkstyle.h
2016-10-24 14:15:11.000000000 +0200
@@ -46,15 +46,15 @@
QBB10DarkStyle();
~QBB10DarkStyle();
- void polish(QApplication *application);
- void polish(QWidget *widget);
+ void polish(QApplication *application) Q_DECL_OVERRIDE;
+ void polish(QWidget *widget) Q_DECL_OVERRIDE;
- QPalette standardPalette() const;
+ QPalette standardPalette() const Q_DECL_OVERRIDE;
void drawControl(ControlElement element, const QStyleOption *option,
- QPainter *painter, const QWidget *widget = 0) const;
+ QPainter *painter, const QWidget *widget = 0) const
Q_DECL_OVERRIDE;
void drawPrimitive(PrimitiveElement element, const QStyleOption *option,
- QPainter *painter, const QWidget *widget) const;
+ QPainter *painter, const QWidget *widget) const
Q_DECL_OVERRIDE;
};
QT_END_NAMESPACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/bb10style/qbb10styleplugin.h
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/bb10style/qbb10styleplugin.h
---
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/bb10style/qbb10styleplugin.h
2016-10-09 16:57:38.000000000 +0200
+++
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/bb10style/qbb10styleplugin.h
2016-10-24 14:15:11.000000000 +0200
@@ -47,7 +47,7 @@
QBB10StylePlugin();
~QBB10StylePlugin();
- QStyle *create(const QString &key);
+ QStyle *create(const QString &key) Q_DECL_OVERRIDE;
QStringList keys() const;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/cleanlooks/qcleanlooksstyle.cpp
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/cleanlooks/qcleanlooksstyle.cpp
---
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/cleanlooks/qcleanlooksstyle.cpp
2016-10-09 16:57:38.000000000 +0200
+++
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/cleanlooks/qcleanlooksstyle.cpp
2016-10-24 14:15:11.000000000 +0200
@@ -1591,9 +1591,7 @@
case CE_DockWidgetTitle:
painter->save();
if (const QStyleOptionDockWidget *dwOpt = qstyleoption_cast<const
QStyleOptionDockWidget *>(option)) {
- const QStyleOptionDockWidgetV2 *v2
- = qstyleoption_cast<const QStyleOptionDockWidgetV2*>(dwOpt);
- bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
+ bool verticalTitleBar = dwOpt->verticalTitleBar;
QRect titleRect = subElementRect(SE_DockWidgetTitleBarText,
option, widget);
if (verticalTitleBar) {
@@ -1711,16 +1709,10 @@
painter->save();
if (const QStyleOptionProgressBar *bar = qstyleoption_cast<const
QStyleOptionProgressBar *>(option)) {
QRect rect = bar->rect;
- bool vertical = false;
- bool inverted = false;
+ bool vertical = (bar->orientation == Qt::Vertical);
+ bool inverted = bar->invertedAppearance;
bool indeterminate = (bar->minimum == 0 && bar->maximum == 0);
- // Get extra style options if version 2
- if (const QStyleOptionProgressBarV2 *bar2 =
qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) {
- vertical = (bar2->orientation == Qt::Vertical);
- inverted = bar2->invertedAppearance;
- }
-
// If the orientation is vertical, we use a transform to rotate
// the progress bar 90 degrees clockwise. This way we can use the
// same rendering code for both orientations.
@@ -3337,11 +3329,11 @@
if (const QStyleOptionGroupBox *groupBox = qstyleoption_cast<const
QStyleOptionGroupBox *>(option)) {
QRect textRect = proxy()->subControlRect(CC_GroupBox, groupBox,
SC_GroupBoxLabel, widget);
QRect checkBoxRect = proxy()->subControlRect(CC_GroupBox,
groupBox, SC_GroupBoxCheckBox, widget);
- bool flat = groupBox->features & QStyleOptionFrameV2::Flat;
+ bool flat = groupBox->features & QStyleOptionFrame::Flat;
if (!flat) {
if (groupBox->subControls & QStyle::SC_GroupBoxFrame) {
- QStyleOptionFrameV2 frame;
+ QStyleOptionFrame frame;
frame.QStyleOption::operator=(*groupBox);
frame.features = groupBox->features;
frame.lineWidth = groupBox->lineWidth;
@@ -4129,7 +4121,7 @@
int topMargin = 0;
int topHeight = 0;
int verticalAlignment =
proxy()->styleHint(SH_GroupBox_TextLabelVerticalAlignment, groupBox, widget);
- bool flat = groupBox->features & QStyleOptionFrameV2::Flat;
+ bool flat = groupBox->features & QStyleOptionFrame::Flat;
if (!groupBox->text.isEmpty()) {
topHeight = groupBox->fontMetrics.height();
if (verticalAlignment & Qt::AlignVCenter)
@@ -4422,9 +4414,9 @@
r.adjust(0, 1, 0, -1);
break;
case SE_DockWidgetTitleBarText: {
- const QStyleOptionDockWidgetV2 *v2
- = qstyleoption_cast<const QStyleOptionDockWidgetV2*>(opt);
- bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
+ const QStyleOptionDockWidget *dwOpt
+ = qstyleoption_cast<const QStyleOptionDockWidget*>(opt);
+ bool verticalTitleBar = dwOpt && dwOpt->verticalTitleBar;
if (verticalTitleBar) {
r.adjust(0, 0, 0, -4);
} else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/cleanlooks/qcleanlooksstyle.h
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/cleanlooks/qcleanlooksstyle.h
---
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/cleanlooks/qcleanlooksstyle.h
2016-10-09 16:57:38.000000000 +0200
+++
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/cleanlooks/qcleanlooksstyle.h
2016-10-24 14:15:11.000000000 +0200
@@ -59,46 +59,46 @@
QCleanlooksStyle();
~QCleanlooksStyle();
- QPalette standardPalette () const;
+ QPalette standardPalette () const Q_DECL_OVERRIDE;
void drawPrimitive(PrimitiveElement elem,
const QStyleOption *option,
- QPainter *painter, const QWidget *widget = 0) const;
+ QPainter *painter, const QWidget *widget = 0) const
Q_DECL_OVERRIDE;
void drawControl(ControlElement ce, const QStyleOption *option, QPainter
*painter,
- const QWidget *widget) const;
- int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const
QWidget *widget = 0) const;
+ const QWidget *widget) const Q_DECL_OVERRIDE;
+ int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const
QWidget *widget = 0) const Q_DECL_OVERRIDE;
void drawComplexControl(ComplexControl control, const QStyleOptionComplex
*option,
- QPainter *painter, const QWidget *widget) const;
- QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget
*widget = 0) const;
+ QPainter *painter, const QWidget *widget) const
Q_DECL_OVERRIDE;
+ QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget
*widget = 0) const Q_DECL_OVERRIDE;
QSize sizeFromContents(ContentsType type, const QStyleOption *option,
- const QSize &size, const QWidget *widget) const;
+ const QSize &size, const QWidget *widget) const
Q_DECL_OVERRIDE;
SubControl hitTestComplexControl(ComplexControl cc, const
QStyleOptionComplex *opt,
- const QPoint &pt, const QWidget *w = 0) const;
+ const QPoint &pt, const QWidget *w = 0) const
Q_DECL_OVERRIDE;
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
- SubControl sc, const QWidget *widget) const;
+ SubControl sc, const QWidget *widget) const
Q_DECL_OVERRIDE;
QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
- const QStyleOption *opt) const;
+ const QStyleOption *opt) const
Q_DECL_OVERRIDE;
int styleHint(StyleHint hint, const QStyleOption *option = 0, const
QWidget *widget = 0,
- QStyleHintReturn *returnData = 0) const;
- QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap)
const;
+ QStyleHintReturn *returnData = 0) const Q_DECL_OVERRIDE;
+ QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap)
const Q_DECL_OVERRIDE;
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option
= 0,
- const QWidget *widget = 0) const;
+ const QWidget *widget = 0) const Q_DECL_OVERRIDE;
QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption
*opt,
- const QWidget *widget = 0) const;
+ const QWidget *widget = 0) const Q_DECL_OVERRIDE;
void drawItemPixmap(QPainter *painter, const QRect &rect,
- int alignment, const QPixmap &pixmap) const;
+ int alignment, const QPixmap &pixmap) const
Q_DECL_OVERRIDE;
void drawItemText(QPainter *painter, const QRect &rect,
int flags, const QPalette &pal, bool enabled,
- const QString &text, QPalette::ColorRole
textRole = QPalette::NoRole) const;
- void polish(QWidget *widget);
- void polish(QApplication *app);
- void polish(QPalette &pal);
- void unpolish(QWidget *widget);
- void unpolish(QApplication *app);
+ const QString &text, QPalette::ColorRole
textRole = QPalette::NoRole) const Q_DECL_OVERRIDE;
+ void polish(QWidget *widget) Q_DECL_OVERRIDE;
+ void polish(QApplication *app) Q_DECL_OVERRIDE;
+ void polish(QPalette &pal) Q_DECL_OVERRIDE;
+ void unpolish(QWidget *widget) Q_DECL_OVERRIDE;
+ void unpolish(QApplication *app) Q_DECL_OVERRIDE;
protected:
- void timerEvent(QTimerEvent *);
- bool eventFilter(QObject *o, QEvent *e);
+ void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+ bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE;
void startProgressAnimation(QObject *o, QProgressBar *bar);
void stopProgressAnimation(QObject *o, QProgressBar *bar);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/gtk2/qgtkstyle.cpp
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/gtk2/qgtkstyle.cpp
---
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/gtk2/qgtkstyle.cpp
2016-10-09 16:57:38.000000000 +0200
+++
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/gtk2/qgtkstyle.cpp
2016-10-24 14:15:11.000000000 +0200
@@ -1241,27 +1241,22 @@
GtkStateType state = GTK_STATE_NORMAL; // Only state supported by
gtknotebook
bool reverse = (option->direction == Qt::RightToLeft);
gtk_widget_set_direction(gtkNotebook, reverse ? GTK_TEXT_DIR_RTL :
GTK_TEXT_DIR_LTR);
- if (const QStyleOptionTabWidgetFrameV2 *tabframe =
qstyleoption_cast<const QStyleOptionTabWidgetFrameV2*>(option)) {
- GtkPositionType frameType = GTK_POS_TOP;
- QTabBar::Shape shape = frame->shape;
- int gapStart = 0;
- int gapSize = 0;
- if (shape == QTabBar::RoundedNorth || shape ==
QTabBar::RoundedSouth) {
- frameType = (shape == QTabBar::RoundedNorth) ? GTK_POS_TOP
: GTK_POS_BOTTOM;
- gapStart = tabframe->selectedTabRect.left();
- gapSize = tabframe->selectedTabRect.width();
- } else {
- frameType = (shape == QTabBar::RoundedWest) ? GTK_POS_LEFT
: GTK_POS_RIGHT;
- gapStart = tabframe->selectedTabRect.y();
- gapSize = tabframe->selectedTabRect.height();
- }
- gtkPainter->paintBoxGap(gtkNotebook, "notebook", option->rect,
state, shadow, frameType,
- gapStart, gapSize, style);
- break; // done
- }
- // Note this is only the fallback option
- gtkPainter->paintBox(gtkNotebook, "notebook", option->rect, state,
shadow, style);
+ GtkPositionType frameType = GTK_POS_TOP;
+ QTabBar::Shape shape = frame->shape;
+ int gapStart = 0;
+ int gapSize = 0;
+ if (shape == QTabBar::RoundedNorth || shape ==
QTabBar::RoundedSouth) {
+ frameType = (shape == QTabBar::RoundedNorth) ? GTK_POS_TOP :
GTK_POS_BOTTOM;
+ gapStart = frame->selectedTabRect.left();
+ gapSize = frame->selectedTabRect.width();
+ } else {
+ frameType = (shape == QTabBar::RoundedWest) ? GTK_POS_LEFT :
GTK_POS_RIGHT;
+ gapStart = frame->selectedTabRect.y();
+ gapSize = frame->selectedTabRect.height();
+ }
+ gtkPainter->paintBoxGap(gtkNotebook, "notebook", option->rect,
state, shadow, frameType,
+ gapStart, gapSize, style);
}
break;
@@ -2663,11 +2658,8 @@
QColor alternateTextColor= QColor(gdkText.red>>8,
gdkText.green>>8, gdkText.blue>>8);
painter->save();
- bool vertical = false, inverted = false;
- if (const QStyleOptionProgressBarV2 *bar2 =
qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) {
- vertical = (bar2->orientation == Qt::Vertical);
- inverted = bar2->invertedAppearance;
- }
+ bool vertical = (bar->orientation == Qt::Vertical);
+ bool inverted = bar->invertedAppearance;
if (vertical)
rect = QRect(rect.left(), rect.top(), rect.height(),
rect.width()); // flip width and height
const int progressIndicatorPos = (bar->progress -
qreal(bar->minimum)) * rect.width() /
@@ -2870,9 +2862,7 @@
case CE_DockWidgetTitle:
painter->save();
if (const QStyleOptionDockWidget *dwOpt = qstyleoption_cast<const
QStyleOptionDockWidget *>(option)) {
- const QStyleOptionDockWidgetV2 *v2
- = qstyleoption_cast<const QStyleOptionDockWidgetV2*>(dwOpt);
- bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
+ bool verticalTitleBar = dwOpt->verticalTitleBar;
QRect rect = dwOpt->rect;
QRect titleRect = subElementRect(SE_DockWidgetTitleBarText,
option, widget).adjusted(-2, 0, -2, 0);
@@ -3443,15 +3433,9 @@
int xt = style->xthickness;
int yt = style->ythickness;
QRect rect = bar->rect.adjusted(xt, yt, -xt, -yt);
- bool vertical = false;
- bool inverted = false;
+ bool vertical = (bar->orientation == Qt::Vertical);
+ bool inverted = bar->invertedAppearance;
bool indeterminate = (bar->minimum == 0 && bar->maximum == 0);
- // Get extra style options if version 2
-
- if (const QStyleOptionProgressBarV2 *bar2 =
qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) {
- vertical = (bar2->orientation == Qt::Vertical);
- inverted = bar2->invertedAppearance;
- }
// If the orientation is vertical, we use a transform to rotate
// the progress bar 90 degrees clockwise. This way we can use the
@@ -4147,9 +4131,9 @@
r.adjust(0, 1, 0, -1);
break;
case SE_DockWidgetTitleBarText: {
- const QStyleOptionDockWidgetV2 *v2
- = qstyleoption_cast<const QStyleOptionDockWidgetV2*>(option);
- bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
+ const QStyleOptionDockWidget *dwOpt
+ = qstyleoption_cast<const QStyleOptionDockWidget*>(option);
+ bool verticalTitleBar = dwOpt && dwOpt->verticalTitleBar;
if (verticalTitleBar) {
r.adjust(0, 0, 0, -4);
} else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/motif/qcdestyle.h
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/motif/qcdestyle.h
---
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/motif/qcdestyle.h
2016-10-09 16:57:38.000000000 +0200
+++
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/motif/qcdestyle.h
2016-10-24 14:15:11.000000000 +0200
@@ -57,14 +57,14 @@
virtual ~QCDEStyle();
int pixelMetric(PixelMetric metric, const QStyleOption *option = 0,
- const QWidget *widget = 0) const;
+ const QWidget *widget = 0) const Q_DECL_OVERRIDE;
void drawControl(ControlElement element, const QStyleOption *opt, QPainter
*p,
- const QWidget *w = 0) const;
+ const QWidget *w = 0) const Q_DECL_OVERRIDE;
void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter
*p,
- const QWidget *w = 0) const;
- QPalette standardPalette() const;
+ const QWidget *w = 0) const Q_DECL_OVERRIDE;
+ QPalette standardPalette() const Q_DECL_OVERRIDE;
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt =
0,
- const QWidget *widget = 0) const;
+ const QWidget *widget = 0) const Q_DECL_OVERRIDE;
};
QT_END_NAMESPACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/motif/qmotifstyle.cpp
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/motif/qmotifstyle.cpp
---
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/motif/qmotifstyle.cpp
2016-10-09 16:57:38.000000000 +0200
+++
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/motif/qmotifstyle.cpp
2016-10-24 14:15:11.000000000 +0200
@@ -744,9 +744,8 @@
case PE_IndicatorProgressChunk:
{
- bool vertical = false;
- if (const QStyleOptionProgressBarV2 *pb2 = qstyleoption_cast<const
QStyleOptionProgressBarV2 *>(opt))
- vertical = (pb2->orientation == Qt::Vertical);
+ const QStyleOptionProgressBar *pb = qstyleoption_cast<const
QStyleOptionProgressBar *>(opt);
+ bool vertical = pb && (pb->orientation == Qt::Vertical);
if (!vertical) {
p->fillRect(opt->rect.x(), opt->rect.y(), opt->rect.width(),
opt->rect.height(),
opt->palette.brush(QPalette::Highlight));
@@ -995,14 +994,9 @@
if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const
QStyleOptionProgressBar *>(opt)) {
QTransform oldMatrix = p->transform();
QRect rect = pb->rect;
- bool vertical = false;
- bool invert = false;
- bool bottomToTop = false;
- if (const QStyleOptionProgressBarV2 *pb2 = qstyleoption_cast<const
QStyleOptionProgressBarV2 *>(opt)) {
- vertical = (pb2->orientation == Qt::Vertical);
- invert = pb2->invertedAppearance;
- bottomToTop = pb2->bottomToTop;
- }
+ bool vertical = (pb->orientation == Qt::Vertical);
+ bool invert = pb->invertedAppearance;
+ bool bottomToTop = pb->bottomToTop;
if (vertical) {
QTransform m;
rect = QRect(rect.left(), rect.top(), rect.height(),
rect.width()); // flip width and height
@@ -1259,15 +1253,8 @@
case CE_ProgressBarContents:
if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const
QStyleOptionProgressBar *>(opt)) {
QRect rect = pb->rect;
- bool vertical = false;
- bool inverted = false;
-
- // Get extra style options if version 2
- const QStyleOptionProgressBarV2 *pb2 = qstyleoption_cast<const
QStyleOptionProgressBarV2 *>(opt);
- if (pb2) {
- vertical = (pb2->orientation == Qt::Vertical);
- inverted = pb2->invertedAppearance;
- }
+ bool vertical = (pb->orientation == Qt::Vertical);
+ bool inverted = pb->invertedAppearance;
QTransform m;
if (vertical) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/motif/qmotifstyle.h
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/motif/qmotifstyle.h
---
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/motif/qmotifstyle.h
2016-10-09 16:57:38.000000000 +0200
+++
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/motif/qmotifstyle.h
2016-10-24 14:15:11.000000000 +0200
@@ -65,47 +65,47 @@
void setUseHighlightColors(bool);
bool useHighlightColors() const;
- void polish(QPalette&);
- void polish(QWidget*);
- void unpolish(QWidget*);
- void polish(QApplication*);
- void unpolish(QApplication*);
+ void polish(QPalette&) Q_DECL_OVERRIDE;
+ void polish(QWidget*) Q_DECL_OVERRIDE;
+ void unpolish(QWidget*) Q_DECL_OVERRIDE;
+ void polish(QApplication*) Q_DECL_OVERRIDE;
+ void unpolish(QApplication*) Q_DECL_OVERRIDE;
void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter
*p,
- const QWidget *w = 0) const;
+ const QWidget *w = 0) const Q_DECL_OVERRIDE;
void drawControl(ControlElement element, const QStyleOption *opt, QPainter
*p,
- const QWidget *w = 0) const;
+ const QWidget *w = 0) const Q_DECL_OVERRIDE;
void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt,
QPainter *p,
- const QWidget *w = 0) const;
+ const QWidget *w = 0) const Q_DECL_OVERRIDE;
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
- SubControl sc, const QWidget *widget = 0) const;
+ SubControl sc, const QWidget *widget = 0) const
Q_DECL_OVERRIDE;
int pixelMetric(PixelMetric metric, const QStyleOption *option = 0,
- const QWidget *widget = 0) const;
+ const QWidget *widget = 0) const Q_DECL_OVERRIDE;
QSize sizeFromContents(ContentsType ct, const QStyleOption *opt,
- const QSize &contentsSize, const QWidget *widget =
0) const;
+ const QSize &contentsSize, const QWidget *widget =
0) const Q_DECL_OVERRIDE;
- QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget
*widget = 0) const;
+ QRect subElementRect(SubElement r, const QStyleOption *opt,const QWidget
*widget = 0) const Q_DECL_OVERRIDE;
QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption
*opt,
- const QWidget *widget = 0) const;
+ const QWidget *widget = 0) const Q_DECL_OVERRIDE;
int styleHint(StyleHint hint, const QStyleOption *opt = 0, const QWidget
*widget = 0,
- QStyleHintReturn *returnData = 0) const;
+ QStyleHintReturn *returnData = 0) const Q_DECL_OVERRIDE;
- bool event(QEvent *);
- QPalette standardPalette() const;
+ bool event(QEvent *) Q_DECL_OVERRIDE;
+ QPalette standardPalette() const Q_DECL_OVERRIDE;
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt =
0,
- const QWidget *widget = 0) const;
+ const QWidget *widget = 0) const Q_DECL_OVERRIDE;
protected:
QPointer<QFocusFrame> focus;
- void timerEvent(QTimerEvent *event);
- bool eventFilter(QObject *o, QEvent *e);
+ void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
+ bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE;
private:
bool highlightCols;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/plastique/qplastiquestyle.cpp
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/plastique/qplastiquestyle.cpp
---
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/plastique/qplastiquestyle.cpp
2016-10-09 16:57:38.000000000 +0200
+++
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/plastique/qplastiquestyle.cpp
2016-10-24 14:15:11.000000000 +0200
@@ -1298,15 +1298,15 @@
#ifndef QT_NO_GROUPBOX
case PE_FrameGroupBox:
if (const QStyleOptionFrame *frame = qstyleoption_cast<const
QStyleOptionFrame *>(option)) {
- QStyleOptionFrameV2 frameV2(*frame);
- if (frameV2.features & QStyleOptionFrameV2::Flat) {
+ if (frame->features & QStyleOptionFrame::Flat) {
QPen oldPen = painter->pen();
painter->setPen(borderColor);
- painter->drawLine(frameV2.rect.topLeft(),
frameV2.rect.topRight());
+ painter->drawLine(frame->rect.topLeft(),
frame->rect.topRight());
painter->setPen(oldPen);
} else {
- frameV2.state &= ~(State_Sunken | State_HasFocus);
- proxy()->drawPrimitive(PE_Frame, &frameV2, painter, widget);
+ QStyleOptionFrame frame2(*frame);
+ frame2.state &= ~(State_Sunken | State_HasFocus);
+ proxy()->drawPrimitive(PE_Frame, &frame2, painter, widget);
}
}
break;
@@ -2436,15 +2436,9 @@
painter->setFont(font);
painter->setPen(bar->palette.text().color());
- bool vertical = false;
- bool inverted = false;
- bool bottomToTop = false;
- // Get extra style options if version 2
- if (const QStyleOptionProgressBarV2 *bar2 =
qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) {
- vertical = (bar2->orientation == Qt::Vertical);
- inverted = bar2->invertedAppearance;
- bottomToTop = bar2->bottomToTop;
- }
+ bool vertical = (bar->orientation == Qt::Vertical);
+ bool inverted = bar->invertedAppearance;
+ bool bottomToTop = bar->bottomToTop;
if (vertical) {
rect = QRect(rect.left(), rect.top(), rect.height(),
rect.width()); // flip width and height
@@ -2499,20 +2493,14 @@
case CE_ProgressBarContents:
if (const QStyleOptionProgressBar *bar = qstyleoption_cast<const
QStyleOptionProgressBar *>(option)) {
QRect rect = bar->rect;
- bool vertical = false;
- bool inverted = false;
+ bool vertical = (bar->orientation == Qt::Vertical);
+ bool inverted = bar->invertedAppearance;
bool indeterminate = (bar->minimum == 0 && bar->maximum == 0);
if (!indeterminate && bar->progress == -1)
break;
painter->save();
- // Get extra style options if version 2
- if (const QStyleOptionProgressBarV2 *bar2 =
qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) {
- vertical = (bar2->orientation == Qt::Vertical);
- inverted = bar2->invertedAppearance;
- }
-
// If the orientation is vertical, we use a transform to rotate
// the progress bar 90 degrees clockwise. This way we can use the
// same rendering code for both orientations.
@@ -3114,9 +3102,7 @@
if (const QStyleOptionDockWidget *dockWidget = qstyleoption_cast<const
QStyleOptionDockWidget *>(option)) {
painter->save();
- const QStyleOptionDockWidgetV2 *v2
- = qstyleoption_cast<const
QStyleOptionDockWidgetV2*>(dockWidget);
- bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
+ bool verticalTitleBar = dockWidget->verticalTitleBar;
// Find text width and title rect
int textWidth = option->fontMetrics.width(dockWidget->title);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/plastique/qplastiquestyle.h
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/plastique/qplastiquestyle.h
---
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/plastique/qplastiquestyle.h
2016-10-09 16:57:38.000000000 +0200
+++
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/plastique/qplastiquestyle.h
2016-10-24 14:15:11.000000000 +0200
@@ -60,47 +60,47 @@
~QPlastiqueStyle();
void drawPrimitive(PrimitiveElement element, const QStyleOption *option,
- QPainter *painter, const QWidget *widget = 0) const;
+ QPainter *painter, const QWidget *widget = 0) const
Q_DECL_OVERRIDE;
void drawControl(ControlElement element, const QStyleOption *option,
- QPainter *painter, const QWidget *widget) const;
+ QPainter *painter, const QWidget *widget) const
Q_DECL_OVERRIDE;
void drawComplexControl(ComplexControl control, const QStyleOptionComplex
*option,
- QPainter *painter, const QWidget *widget) const;
+ QPainter *painter, const QWidget *widget) const
Q_DECL_OVERRIDE;
QSize sizeFromContents(ContentsType type, const QStyleOption *option,
- const QSize &size, const QWidget *widget) const;
+ const QSize &size, const QWidget *widget) const
Q_DECL_OVERRIDE;
- QRect subElementRect(SubElement element, const QStyleOption *option, const
QWidget *widget) const;
+ QRect subElementRect(SubElement element, const QStyleOption *option, const
QWidget *widget) const Q_DECL_OVERRIDE;
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
- SubControl sc, const QWidget *widget) const;
+ SubControl sc, const QWidget *widget) const
Q_DECL_OVERRIDE;
int styleHint(StyleHint hint, const QStyleOption *option = 0, const
QWidget *widget = 0,
- QStyleHintReturn *returnData = 0) const;
+ QStyleHintReturn *returnData = 0) const Q_DECL_OVERRIDE;
SubControl hitTestComplexControl(ComplexControl control, const
QStyleOptionComplex *option,
- const QPoint &pos, const QWidget *widget
= 0) const;
+ const QPoint &pos, const QWidget *widget
= 0) const Q_DECL_OVERRIDE;
- int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const
QWidget *widget = 0) const;
+ int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const
QWidget *widget = 0) const Q_DECL_OVERRIDE;
QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption
*opt,
- const QWidget *widget = 0) const;
+ const QWidget *widget = 0) const Q_DECL_OVERRIDE;
- void polish(QWidget *widget);
- void polish(QApplication *app);
- void polish(QPalette &pal);
- void unpolish(QWidget *widget);
- void unpolish(QApplication *app);
+ void polish(QWidget *widget) Q_DECL_OVERRIDE;
+ void polish(QApplication *app) Q_DECL_OVERRIDE;
+ void polish(QPalette &pal) Q_DECL_OVERRIDE;
+ void unpolish(QWidget *widget) Q_DECL_OVERRIDE;
+ void unpolish(QApplication *app) Q_DECL_OVERRIDE;
- QPalette standardPalette() const;
+ QPalette standardPalette() const Q_DECL_OVERRIDE;
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt =
0,
- const QWidget *widget = 0) const;
+ const QWidget *widget = 0) const Q_DECL_OVERRIDE;
int layoutSpacing(QSizePolicy::ControlType control1,
QSizePolicy::ControlType control2,
Qt::Orientation orientation,
const QStyleOption *option = 0,
- const QWidget *widget = 0) const;
+ const QWidget *widget = 0) const Q_DECL_OVERRIDE;
protected:
- bool eventFilter(QObject *watched, QEvent *event);
- void timerEvent(QTimerEvent *event);
+ bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
+ void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
private:
int animateStep;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/styles.pro
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/styles.pro
---
old/qtstyleplugins-opensource-src-5.0.0+git20161005/src/plugins/styles/styles.pro
2016-10-09 16:57:38.000000000 +0200
+++
new/qtstyleplugins-opensource-src-5.0.0+git20161022/src/plugins/styles/styles.pro
2016-10-24 14:15:11.000000000 +0200
@@ -2,8 +2,12 @@
SUBDIRS = \
cleanlooks \
motif \
- plastique \
- bb10style
+ plastique
+
+greaterThan(QT_MAJOR_VERSION, 5) | greaterThan(QT_MINOR_VERSION, 6) {
+ # only 5.7 or later
+ SUBDIRS += bb10style
+}
packagesExist(gtk+-2.0 x11) {
SUBDIRS += gtk2
