diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-11-18 18:11:26 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-18 18:30:39 +0100 |
| commit | f04db51dbb10853205725a6af6f1252c372bb16a (patch) | |
| tree | 707b8d0fa1e4ac438f6c30a02516284d62e1c1bf | |
| parent | 27b7c8ac2f372232e0add9489086c91753033b20 (diff) | |
MinGW: Fix warnings about assigned but not used variables.
Change-Id: I114483273db0f9ffe0527b4a3e4cd881375a3448
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | src/gui/kernel/qapplication_win.cpp | 1 | ||||
| -rw-r--r-- | src/gui/styles/qwindowsvistastyle.cpp | 7 | ||||
| -rw-r--r-- | src/gui/styles/qwindowsxpstyle.cpp | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index ef9f582f3d..060ff466b6 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -694,7 +694,6 @@ void QApplicationPrivate::initializeWidgetPaletteHash() menu.setColor(QPalette::Active, QPalette::Text, menuText); menu.setColor(QPalette::Active, QPalette::WindowText, menuText); menu.setColor(QPalette::Active, QPalette::ButtonText, menuText); - const QColor fg = menu.foreground().color(), btn = menu.button().color(); QColor disabled(qt_colorref2qrgb(GetSysColor(COLOR_GRAYTEXT))); menu.setColor(QPalette::Disabled, QPalette::WindowText, disabled); menu.setColor(QPalette::Disabled, QPalette::Text, disabled); diff --git a/src/gui/styles/qwindowsvistastyle.cpp b/src/gui/styles/qwindowsvistastyle.cpp index 4008ab12ef..1682822e1e 100644 --- a/src/gui/styles/qwindowsvistastyle.cpp +++ b/src/gui/styles/qwindowsvistastyle.cpp @@ -747,7 +747,6 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt if (cg == QPalette::Normal && !(vopt->state & QStyle::State_Active)) cg = QPalette::Inactive; - QRect textRect = subElementRect(QStyle::SE_ItemViewItemText, option, widget); QRect itemRect = subElementRect(QStyle::SE_ItemViewItemFocusRect, option, widget).adjusted(-1, 0, 1, 0); itemRect.setTop(vopt->rect.top()); itemRect.setBottom(vopt->rect.bottom()); @@ -1079,9 +1078,6 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption case CE_ProgressBarContents: if (const QStyleOptionProgressBar *bar = qstyleoption_cast<const QStyleOptionProgressBar *>(option)) { - int stateId = MBI_NORMAL; - if (disabled) - stateId = MBI_DISABLED; bool isIndeterminate = (bar->minimum == 0 && bar->maximum == 0); bool vertical = false; bool inverted = false; @@ -1259,10 +1255,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption pGetThemeMargins(theme.handle(), NULL, MENU_POPUPCHECK, 0, TMT_CONTENTMARGINS, NULL, &margins); checkcol = qMax(menuitem->maxIconWidth, int(6 + size.cx + margins.cxLeftWidth + margins.cxRightWidth)); } - QColor darkLine = option->palette.background().color().darker(108); - QColor lightLine = option->palette.background().color().lighter(107); QRect rect = option->rect; - QStyleOptionMenuItem mbiCopy = *menuitem; //draw vertical menu line QPoint p1 = QStyle::visualPos(option->direction, menuitem->rect, QPoint(checkcol, rect.top())); diff --git a/src/gui/styles/qwindowsxpstyle.cpp b/src/gui/styles/qwindowsxpstyle.cpp index d33aba265c..f65fd79d02 100644 --- a/src/gui/styles/qwindowsxpstyle.cpp +++ b/src/gui/styles/qwindowsxpstyle.cpp @@ -2397,7 +2397,6 @@ void QWindowsXPStyle::drawControl(ControlElement element, const QStyleOption *op if (qstyleoption_cast<const QStyleOptionRubberBand *>(option)) { QColor highlight = option->palette.color(QPalette::Active, QPalette::Highlight); p->save(); - QRect r = option->rect; p->setPen(highlight.darker(120)); QColor dimHighlight(qMin(highlight.red()/2 + 110, 255), qMin(highlight.green()/2 + 110, 255), |