Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	qmake/Makefile.unix
	qmake/generators/makefile.cpp
	src/corelib/global/qglobal.h
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/kernel/qaction.cpp
	src/gui/kernel/qaction.h
	src/gui/kernel/qaction_p.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget.h
	src/gui/kernel/qwidget_mac.mm
	src/gui/painting/qgraphicssystemfactory.cpp
	src/gui/styles/qwindowsstyle.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qabstractscrollarea_p.h
	src/network/access/qnetworkaccessdebugpipebackend.cpp
	src/network/socket/qlocalsocket_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfile/tst_qfile.cpp
	tests/auto/qobject/tst_qobject.cpp
	tests/auto/qpathclipper/qpathclipper.pro
	tests/auto/qprocess/tst_qprocess.cpp
	tests/auto/qsettings/tst_qsettings.cpp
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qsqlquerymodel/qsqlquerymodel.pro
	tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
	tests/auto/qsqltablemodel/qsqltablemodel.pro
	tests/auto/qsqlthread/qsqlthread.pro
	tests/auto/qwidget/tst_qwidget.cpp

1 files changed, 40 insertions, 82 deletions

diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp
index ea8ee87..bc1df9d 100644
--- a/src/gui/styles/qwindowsstyle.cpp
+++ b/src/gui/styles/qwindowsstyle.cpp
@@ -127,8 +127,6 @@ static const int windowsTabSpacing       = 12; // space between text and tab
 static const int windowsRightBorder      = 15; // right border on windows
 static const int windowsCheckMarkWidth   = 12; // checkmarks width on windows
 
-static bool use2000style = true;
-
 enum QSliderDirection { SlUp, SlDown, SlLeft, SlRight };
 
 /*
@@ -270,9 +268,6 @@ bool QWindowsStyle::eventFilter(QObject *o, QEvent *e)
 */
 QWindowsStyle::QWindowsStyle() : QCommonStyle(*new QWindowsStylePrivate)
 {
-#if defined(Q_OS_WIN32)
-    use2000style = QSysInfo::WindowsVersion != QSysInfo::WV_NT && QSysInfo::WindowsVersion != QSysInfo::WV_95;
-#endif
 }
 
 /*!
@@ -282,9 +277,6 @@ QWindowsStyle::QWindowsStyle() : QCommonStyle(*new QWindowsStylePrivate)
 */
 QWindowsStyle::QWindowsStyle(QWindowsStylePrivate &dd) : QCommonStyle(dd)
 {
-#if defined(Q_OS_WIN32)
-    use2000style = QSysInfo::WindowsVersion != QSysInfo::WV_NT && QSysInfo::WindowsVersion != QSysInfo::WV_95;
-#endif
 }
 
 
@@ -1070,6 +1062,8 @@ QPixmap QWindowsStyle::standardPixmap(StandardPixmap standardPixmap, const QStyl
             }
         }
         break;
+    default:
+        break;
     }
     if (!desktopIcon.isNull()) {
         return desktopIcon;
@@ -1138,12 +1132,7 @@ int QWindowsStyle::styleHint(StyleHint hint, const QStyleOption *opt, const QWid
 #endif
         break;
     case SH_ItemView_ChangeHighlightOnFocus:
-#if defined(Q_WS_WIN)
-        if (QSysInfo::WindowsVersion != QSysInfo::WV_95 && QSysInfo::WindowsVersion != QSysInfo::WV_NT)
-            ret = 1;
-        else
-#endif
-            ret = 0;
+        ret = 1;
         break;
     case SH_ToolBox_SelectedPageTitleBold:
         ret = 0;
@@ -1151,36 +1140,34 @@ int QWindowsStyle::styleHint(StyleHint hint, const QStyleOption *opt, const QWid
 
 #if defined(Q_WS_WIN)
     case SH_UnderlineShortcut:
+    {
         ret = 1;
-        if (QSysInfo::WindowsVersion != QSysInfo::WV_95
-            && QSysInfo::WindowsVersion != QSysInfo::WV_98
-            && QSysInfo::WindowsVersion != QSysInfo::WV_NT) {
-            BOOL cues;
-            SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &cues, 0);
-            ret = int(cues);
-            // Do nothing if we always paint underlines
-            Q_D(const QWindowsStyle);
-            if (!ret && widget && d) {
+        BOOL cues = false;
+        SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &cues, 0);
+        ret = int(cues);
+        // Do nothing if we always paint underlines
+        Q_D(const QWindowsStyle);
+        if (!ret && widget && d) {
 #ifndef QT_NO_MENUBAR
-                const QMenuBar *menuBar = qobject_cast<const QMenuBar *>(widget);
-                if (!menuBar && qobject_cast<const QMenu *>(widget)) {
-                    QWidget *w = QApplication::activeWindow();
-                    if (w && w != widget)
-                        menuBar = qFindChild<QMenuBar *>(w);
-                }
-                // If we paint a menu bar draw underlines if is in the keyboardState
-                if (menuBar) {
-                    if (menuBar->d_func()->keyboardState || d->altDown())
-                        ret = 1;
-                    // Otherwise draw underlines if the toplevel widget has seen an alt-press
-                } else
-#endif // QT_NO_MENUBAR
-                if (d->hasSeenAlt(widget)) {
+            const QMenuBar *menuBar = qobject_cast<const QMenuBar *>(widget);
+            if (!menuBar && qobject_cast<const QMenu *>(widget)) {
+                QWidget *w = QApplication::activeWindow();
+                if (w && w != widget)
+                    menuBar = qFindChild<QMenuBar *>(w);
+            }
+            // If we paint a menu bar draw underlines if is in the keyboardState
+            if (menuBar) {
+                if (menuBar->d_func()->keyboardState || d->altDown())
                     ret = 1;
-                }
+                // Otherwise draw underlines if the toplevel widget has seen an alt-press
+            } else
+#endif // QT_NO_MENUBAR
+            if (d->hasSeenAlt(widget)) {
+                ret = 1;
             }
         }
         break;
+    }
 #endif
 #ifndef QT_NO_RUBBERBAND
     case SH_RubberBand_Mask:
@@ -1318,7 +1305,7 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
         if ((!(opt->state & State_Sunken ))
             && (!(opt->state & State_Enabled)
                 || !(opt->state & State_MouseOver && opt->state & State_AutoRaise))
-            && (opt->state & State_On) && use2000style) {
+            && (opt->state & State_On)) {
             fill = QBrush(opt->palette.light().color(), Qt::Dense4Pattern);
             stippled = true;
         } else {
@@ -1391,11 +1378,8 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
             QRect r = opt->rect;
             int size = qMin(r.height(), r.width());
             QPixmap pixmap;
-            QString pixmapName;
-            pixmapName.sprintf("%s-%s-%d-%d-%d-%lld",
-                               "$qt_ia", metaObject()->className(),
-                               uint(opt->state), pe,
-                               size, opt->palette.cacheKey());
+            QString pixmapName = QStyleHelper::uniqueName(QLatin1String("$qt_ia-") + QLatin1String(metaObject()->className()), opt, QSize(size, size))
+                  + QLatin1Char('-') + QString::number(pe);                               
             if (!QPixmapCache::find(pixmapName, pixmap)) {
                 int border = size/5;
                 int sqsize = 2*(size/2);
@@ -1632,9 +1616,9 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
                     popupPal.setColor(QPalette::Light, frame->palette.background().color());
                     popupPal.setColor(QPalette::Midlight, frame->palette.light().color());
                 }
-                if (use2000style && pe == PE_Frame && (frame->state & State_Raised))
+                if (pe == PE_Frame && (frame->state & State_Raised))
                     qDrawWinButton(p, frame->rect, popupPal, frame->state & State_Sunken);
-                else if (use2000style && pe == PE_Frame && (frame->state & State_Sunken))
+                else if (pe == PE_Frame && (frame->state & State_Sunken))
                 {
                     popupPal.setColor(QPalette::Midlight, frame->palette.background().color());
                     qDrawWinPanel(p, frame->rect, popupPal, frame->state & State_Sunken);
@@ -1785,11 +1769,12 @@ case PE_FrameDockWidget:
         break;
 #endif // QT_NO_PROGRESSBAR
 
-    case PE_FrameTabWidget:
-        if (use2000style) {
-            qDrawWinButton(p, opt->rect, opt->palette, false, 0);
-            break;
-       }
+    case PE_FrameTabWidget: {
+        QRect rect = opt->rect;
+        QPalette pal = opt->palette;
+        qDrawWinButton(p, opt->rect, opt->palette, false, 0);
+        break;
+    }
     default:
         QCommonStyle::drawPrimitive(pe, opt, p, w);
     }
@@ -2065,10 +2050,6 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                     p->setPen(light);
                     p->drawLine(x1, y1 + 2, x1, y2 - ((onlyOne || firstTab) && selected && leftAligned ? 0 : borderThinkness));
                     p->drawPoint(x1 + 1, y1 + 1);
-                    if (!use2000style) {
-                        p->setPen(midlight);
-                        p->drawLine(x1 + 1, y1 + 2, x1 + 1, y2 - ((onlyOne || firstTab) && selected && leftAligned ? 0 : borderThinkness));
-                    }
                 }
                 // Top
                 {
@@ -2076,10 +2057,6 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                     int end = x2 - (nextSelected ? 0 : 2);
                     p->setPen(light);
                     p->drawLine(beg, y1, end, y1);
-                    if (!use2000style) {
-                        p->setPen(midlight);
-                        p->drawLine(beg, y1 + 1, end, y1 + 1);
-                    }
                 }
                 // Right
                 if (lastTab || selected || onlyOne || !nextSelected) {
@@ -2109,10 +2086,6 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                     p->setPen(light);
                     p->drawLine(x1, y2 - 2, x1, y1 + ((onlyOne || firstTab) && selected && leftAligned ? 0 : borderThinkness));
                     p->drawPoint(x1 + 1, y2 - 1);
-                    if (!use2000style) {
-                        p->setPen(midlight);
-                        p->drawLine(x1 + 1, y2 - 2, x1 + 1, y1 + ((onlyOne || firstTab) && selected && leftAligned ? 0 : borderThinkness));
-                    }
                 }
                 // Bottom
                 {
@@ -2151,10 +2124,6 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                     p->setPen(light);
                     p->drawLine(x1 + 2, y1, x2 - ((onlyOne || firstTab) && selected && leftAligned ? 0 : borderThinkness), y1);
                     p->drawPoint(x1 + 1, y1 + 1);
-                    if (!use2000style) {
-                        p->setPen(midlight);
-                        p->drawLine(x1 + 2, y1 + 1, x2 - ((onlyOne || firstTab) && selected && leftAligned ? 0 : borderThinkness), y1 + 1);
-                    }
                 }
                 // Left
                 {
@@ -2162,10 +2131,6 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                     int end = y2 - (nextSelected ? 0 : 2);
                     p->setPen(light);
                     p->drawLine(x1, beg, x1, end);
-                    if (!use2000style) {
-                        p->setPen(midlight);
-                        p->drawLine(x1 + 1, beg, x1 + 1, end);
-                    }
                 }
                 // Bottom
                 if (lastTab || selected || onlyOne || !nextSelected) {
@@ -2197,11 +2162,6 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
                     p->setPen(light);
                     p->drawLine(x2 - 2, y1, x1 + ((onlyOne || firstTab) && selected && leftAligned ? 0 : borderThinkness), y1);
                     p->drawPoint(x2 - 1, y1 + 1);
-                    if (!use2000style) {
-                        p->setPen(midlight);
-                        p->drawLine(x2 - 3, y1 + 1, x1 + ((onlyOne || firstTab) && selected && leftAligned ? 0 : borderThinkness), y1 + 1);
-                        p->drawPoint(x2 - 1, y1);
-                    }
                 }
                 // Right
                 {
@@ -2238,7 +2198,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
 #ifndef QT_NO_SCROLLBAR
     case CE_ScrollBarSubLine:
     case CE_ScrollBarAddLine: {
-        if (use2000style && (opt->state & State_Sunken)) {
+        if ((opt->state & State_Sunken)) {
             p->setPen(opt->palette.dark().color());
             p->setBrush(opt->palette.brush(QPalette::Button));
             p->drawRect(opt->rect.adjusted(0, 0, -1, -1));
@@ -3024,8 +2984,7 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp
             if ((cmb->subControls & SC_ComboBoxFrame)) {
                 if (cmb->frame) {
                     QPalette shadePal = opt->palette;
-                    if (use2000style)
-                        shadePal.setColor(QPalette::Midlight, shadePal.button().color());
+                    shadePal.setColor(QPalette::Midlight, shadePal.button().color());
                     qDrawWinPanel(p, opt->rect, shadePal, true, &editBrush);
                 }
                 else {
@@ -3101,8 +3060,7 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp
                 QBrush editBrush = sb->palette.brush(QPalette::Base);
                 QRect r = proxy()->subControlRect(CC_SpinBox, sb, SC_SpinBoxFrame, widget);
                 QPalette shadePal = sb->palette;
-                if (use2000style)
-                    shadePal.setColor(QPalette::Midlight, shadePal.button().color());
+                shadePal.setColor(QPalette::Midlight, shadePal.button().color());
                 qDrawWinPanel(p, r, shadePal, true, &editBrush);
             }
 
@@ -3231,7 +3189,7 @@ QSize QWindowsStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
                                   + 2 * windowsItemFrame));
             }
             int maxpmw = mi->maxIconWidth;
-            int tabSpacing = use2000style ? 20 :windowsTabSpacing;
+            int tabSpacing = 20;
             if (mi->text.contains(QLatin1Char('\t')))
                 w += tabSpacing;
             else if (mi->menuItemType == QStyleOptionMenuItem::SubMenu)