Skip to content

Commit

Permalink
Fix Qt 5.7 build warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Nov 11, 2016
1 parent 156fce9 commit 35d106b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/gui/qgscolorwidgets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ void QgsColorWheel::paintEvent( QPaintEvent *event )
QPainter painter( this );

//draw a frame
QStyleOptionFrameV3 option = QStyleOptionFrameV3();
QStyleOptionFrame option = QStyleOptionFrame();
option.initFrom( this );
option.state = this->hasFocus() ? QStyle::State_Active : QStyle::State_None;
style()->drawPrimitive( QStyle::PE_Frame, &option, &painter );
Expand Down Expand Up @@ -774,7 +774,7 @@ void QgsColorBox::paintEvent( QPaintEvent *event )
Q_UNUSED( event );
QPainter painter( this );

QStyleOptionFrameV3 option;
QStyleOptionFrame option;
option.initFrom( this );
option.state = hasFocus() ? QStyle::State_Active : QStyle::State_None;
style()->drawPrimitive( QStyle::PE_Frame, &option, &painter );
Expand Down Expand Up @@ -1020,7 +1020,7 @@ void QgsColorRampWidget::paintEvent( QPaintEvent *event )
if ( mShowFrame )
{
//draw frame
QStyleOptionFrameV3 option;
QStyleOptionFrame option;
option.initFrom( this );
option.state = hasFocus() ? QStyle::State_KeyboardFocusChange : QStyle::State_None;
style()->drawPrimitive( QStyle::PE_Frame, &option, &painter );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsgradientstopeditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void QgsGradientStopEditor::paintEvent( QPaintEvent *event )
rect().height() - MARGIN_BOTTOM );

//draw frame
QStyleOptionFrameV3 option;
QStyleOptionFrame option;
option.initFrom( this );
option.state = hasFocus() ? QStyle::State_KeyboardFocusChange : QStyle::State_None;
option.rect = frameRect;
Expand Down

0 comments on commit 35d106b

Please sign in to comment.