Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (25 commits)
  Fix compilation
  Fix the build of configure.exe.
  Update the source file of configure.exe to enable QtConcurrent for Symbian
  Get rid of "typename, typename" for TEMPLATE_TEMPLATE_PARAMETERS.
  Compile with msvc
  compile with windows
  get rid of the DisableIfSame hack
  Update configure to enable QtConcurrent for Symbian
  Rewrite the interfaces of QtConcurrent.
  Fix namespace issue with the global static
  Fix regression with QSettings patch
  Reduce open and stat system calls for QSettings
  QNetworkCookie: allow spaces in unquoted values
  fix tst_qscriptengine after merging MR-1149
  QAbstractSocket: Fix waitForReadyRead infinite loop.
  Fixes warnings about unused variables
  Fixes warnings about unused variables
  Fixes warnings about unused variables
  Fixes warnings
  Fixes warnings about unused variables
  ...

1 files changed, 0 insertions, 2 deletions

diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp
index 1dcfd00..754486e 100644
--- a/src/gui/styles/qwindowsstyle.cpp
+++ b/src/gui/styles/qwindowsstyle.cpp
@@ -2028,10 +2028,8 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                                          && tabBarAlignment == Qt::AlignLeft);
 
             QColor light = tab->palette.light().color();
-            QColor midlight = tab->palette.midlight().color();
             QColor dark = tab->palette.dark().color();
             QColor shadow = tab->palette.shadow().color();
-            QColor background = tab->palette.background().color();
             int borderThinkness = proxy()->pixelMetric(PM_TabBarBaseOverlap, tab, widget);
             if (selected)
                 borderThinkness /= 2;