Merge branch '4.8-upstream' into master-water

7 files changed, 69 insertions, 37 deletions

diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index b84fe56..19e7ba5 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -682,7 +682,7 @@ void QApplicationPrivate::initializeWidgetPaletteHash()
     QColor menuText(qt_colorref2qrgb(GetSysColor(COLOR_MENUTEXT)));
     BOOL isFlat = false;
     if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
-        && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based))
+        && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)))
         SystemParametersInfo(SPI_GETFLATMENU, 0, &isFlat, 0);
     QPalette menu(pal);
     // we might need a special color group for the menu.
@@ -697,7 +697,7 @@ void QApplicationPrivate::initializeWidgetPaletteHash()
     menu.setColor(QPalette::Disabled, QPalette::Highlight,
                     QColor(qt_colorref2qrgb(GetSysColor(
                                             (QSysInfo::WindowsVersion >= QSysInfo::WV_XP
-                                            && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based)
+                                            && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based))
                                             && isFlat ? COLOR_MENUHILIGHT : COLOR_HIGHLIGHT))));
     menu.setColor(QPalette::Disabled, QPalette::HighlightedText, disabled);
     menu.setColor(QPalette::Disabled, QPalette::Button,
@@ -719,7 +719,7 @@ void QApplicationPrivate::initializeWidgetPaletteHash()
     QApplication::setPalette(menu, "QMenu");
 
     if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
-        && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based) && isFlat) {
+        && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)) && isFlat) {
         QColor menubar(qt_colorref2qrgb(GetSysColor(COLOR_MENUBAR)));
         menu.setColor(QPalette::Active, QPalette::Button, menubar);
         menu.setColor(QPalette::Disabled, QPalette::Button, menubar);
@@ -982,7 +982,7 @@ const QString qt_reg_winclass(QWidget *w)        // register window class
         style = CS_DBLCLKS;
         if (w->inherits("QTipLabel") || w->inherits("QAlphaWidget")) {
             if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
-                && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based)) {
+                && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based))) {
                 style |= CS_DROPSHADOW;
             }
             cname = QLatin1String("QToolTip");
@@ -1000,7 +1000,7 @@ const QString qt_reg_winclass(QWidget *w)        // register window class
         style |= CS_SAVEBITS;
 #endif
         if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
-            && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based))
+            && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)))
             style |= CS_DROPSHADOW;
         icon = false;
     } else {
@@ -4144,7 +4144,8 @@ PtrCloseTouchInputHandle QApplicationPrivate::CloseTouchInputHandle = 0;
 
 void QApplicationPrivate::initializeMultitouch_sys()
 {
-    if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS7) {
+    if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS7
+        && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)) {
         static const int QT_SM_DIGITIZER = 94;
         int value = GetSystemMetrics(QT_SM_DIGITIZER);
         static const int QT_NID_INTEGRATED_TOUCH = 0x01;
diff --git a/src/gui/kernel/qcursor_win.cpp b/src/gui/kernel/qcursor_win.cpp
index cef83f5..a68472c 100644
--- a/src/gui/kernel/qcursor_win.cpp
+++ b/src/gui/kernel/qcursor_win.cpp
@@ -477,7 +477,7 @@ void QCursorData::update()
         QPixmap pixmap = QApplicationPrivate::instance()->getPixmapCursor(cshape);
         hcurs = create32BitCursor(pixmap, hx, hy);
     }
-        break;
+        return;
     default:
         qWarning("QCursor::update: Invalid cursor shape %d", cshape);
         return;
diff --git a/src/gui/kernel/qguiplatformplugin.cpp b/src/gui/kernel/qguiplatformplugin.cpp
index 708859d..04fd111 100644
--- a/src/gui/kernel/qguiplatformplugin.cpp
+++ b/src/gui/kernel/qguiplatformplugin.cpp
@@ -137,10 +137,10 @@ QString QGuiPlatformPlugin::styleName()
         return QLatin1String("WindowsCE");
 #elif defined(Q_WS_WIN)
     if ((QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA
-        && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based))
+        && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)))
         return QLatin1String("WindowsVista");
     else if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
-        && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based))
+        && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)))
         return QLatin1String("WindowsXP");
     else
         return QLatin1String("Windows");                // default styles for Windows
diff --git a/src/gui/kernel/qwhatsthis.cpp b/src/gui/kernel/qwhatsthis.cpp
index 5328cb1..da79250 100644
--- a/src/gui/kernel/qwhatsthis.cpp
+++ b/src/gui/kernel/qwhatsthis.cpp
@@ -227,7 +227,7 @@ QWhatsThat::QWhatsThat(const QString& txt, QWidget* parent, QWidget *showTextFor
     }
 #if defined(Q_WS_WIN)
     if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
-        && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based))
+        && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)))
     {
         BOOL shadow;
         SystemParametersInfo(SPI_GETDROPSHADOW, 0, &shadow, 0);
@@ -305,7 +305,7 @@ void QWhatsThat::paintEvent(QPaintEvent*)
     bool drawShadow = true;
 #if defined(Q_WS_WIN)
     if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
-        && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based))
+        && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)))
     {
         BOOL shadow;
         SystemParametersInfo(SPI_GETDROPSHADOW, 0, &shadow, 0);
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 0aa1dfa..9b5a283 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -2260,10 +2260,16 @@ void QWidgetPrivate::updateIsOpaque()
 #endif
 
 #ifdef Q_WS_S60
-    if (q->windowType() == Qt::Dialog && q->testAttribute(Qt::WA_TranslucentBackground)
-                && S60->avkonComponentsSupportTransparency) {
-        setOpaque(false);
-        return;
+    if (q->testAttribute(Qt::WA_TranslucentBackground)) {
+        if (q->windowType() & Qt::Dialog || q->windowType() & Qt::Popup) {
+            if (S60->avkonComponentsSupportTransparency) {
+                setOpaque(false);
+                return;
+            }
+        } else {
+            setOpaque(false);
+            return;
+        }
     }
 #endif
 
@@ -2283,11 +2289,16 @@ void QWidgetPrivate::updateIsOpaque()
     }
 
     if (q->isWindow() && !q->testAttribute(Qt::WA_NoSystemBackground)) {
+#ifdef Q_WS_S60
+        setOpaque(true);
+        return;
+#else
         const QBrush &windowBrush = q->palette().brush(QPalette::Window);
         if (windowBrush.style() != Qt::NoBrush && windowBrush.isOpaque()) {
             setOpaque(true);
             return;
         }
+#endif
     }
     setOpaque(false);
 }
@@ -10948,11 +10959,14 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
         }
         break;
     case Qt::WA_TranslucentBackground:
+#if defined(Q_OS_SYMBIAN)
+        setAttribute(Qt::WA_NoSystemBackground, on);
+#else
         if (on) {
             setAttribute(Qt::WA_NoSystemBackground);
             d->updateIsTranslucent();
         }
-
+#endif
         break;
     case Qt::WA_AcceptTouchEvents:
 #if defined(Q_WS_WIN) || defined(Q_WS_MAC) || defined(Q_OS_SYMBIAN)
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index aefffb6..9ac9479 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -233,6 +233,7 @@ struct QTLWExtra {
     uint inExpose : 1; // Prevents drawing recursion
     uint nativeWindowTransparencyEnabled : 1; // Tracks native window transparency
     uint forcedToRaster : 1;
+    uint noSystemRotationDisabled : 1;
 #elif defined(Q_WS_QPA)
     QPlatformWindow *platformWindow;
     QPlatformWindowFormat platformWindowFormat;
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index e06b625..00661ae 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -804,19 +804,12 @@ void QWidgetPrivate::setConstraints_sys()
 void QWidgetPrivate::s60UpdateIsOpaque()
 {
     Q_Q(QWidget);
-
     if (!q->testAttribute(Qt::WA_WState_Created))
         return;
-
     const bool writeAlpha = extraData()->nativePaintMode == QWExtra::BlitWriteAlpha;
-    if (!q->testAttribute(Qt::WA_TranslucentBackground) && !writeAlpha)
-        return;
     const bool requireAlphaChannel = !isOpaque || writeAlpha;
-
     createTLExtra();
-
     RWindow *const window = static_cast<RWindow *>(q->effectiveWinId()->DrawableWindow());
-
 #ifdef Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE
     if (QApplicationPrivate::instance()->useTranslucentEGLSurfaces
             && !extra->topextra->forcedToRaster) {
@@ -825,25 +818,47 @@ void QWidgetPrivate::s60UpdateIsOpaque()
         return;
     }
 #endif
+    const bool recreateBackingStore = extra->topextra->backingStore.data() && (
+                                          QApplicationPrivate::graphics_system_name == QLatin1String("openvg") ||
+                                          QApplicationPrivate::graphics_system_name == QLatin1String("opengl")
+                                      );
     if (requireAlphaChannel) {
-        const TDisplayMode displayMode = static_cast<TDisplayMode>(window->SetRequiredDisplayMode(EColor16MA));
-        if (window->SetTransparencyAlphaChannel() == KErrNone) {
+        window->SetRequiredDisplayMode(EColor16MA);
+        if (window->SetTransparencyAlphaChannel() == KErrNone)
             window->SetBackgroundColor(TRgb(255, 255, 255, 0));
-            extra->topextra->nativeWindowTransparencyEnabled = 1;
-            if (extra->topextra->backingStore.data() && (
-                    QApplicationPrivate::graphics_system_name == QLatin1String("openvg")
-                    || QApplicationPrivate::graphics_system_name == QLatin1String("opengl"))) {
-                // Semi-transparent EGL surfaces aren't supported. We need to
-                // recreate backing store to get translucent surface (raster surface).
-                extra->topextra->backingStore.create(q);
-                extra->topextra->backingStore.registerWidget(q);
-                // FixNativeOrientation() will not work without an EGL surface.
+    } else {
+        if (recreateBackingStore) {
+            // Clear the UI surface to ensure that the EGL surface content is visible
+            CWsScreenDevice *screenDevice = S60->screenDevice(q);
+            QScopedPointer<CWindowGc> gc(new CWindowGc(screenDevice));
+            const int err = gc->Construct();
+            if (!err) {
+                gc->Activate(*window);
+                window->BeginRedraw();
+                gc->SetDrawMode(CWindowGc::EDrawModeWriteAlpha);
+                gc->SetBrushColor(TRgb(0, 0, 0, 0));
+                gc->Clear(TRect(0, 0, q->width(), q->height()));
+                window->EndRedraw();
+            }
+        }
+        if (extra->topextra->nativeWindowTransparencyEnabled)
+            window->SetTransparentRegion(TRegionFix<1>());
+    }
+    extra->topextra->nativeWindowTransparencyEnabled = requireAlphaChannel;
+    if (recreateBackingStore) {
+        extra->topextra->backingStore.create(q);
+        extra->topextra->backingStore.registerWidget(q);
+        bool noSystemRotationDisabled = false;
+        if (requireAlphaChannel) {
+            if (q->testAttribute(Qt::WA_SymbianNoSystemRotation)) {
+                // FixNativeOrientation() will not work without an EGL surface
                 q->setAttribute(Qt::WA_SymbianNoSystemRotation, false);
+                noSystemRotationDisabled = true;
             }
+        } else {
+            q->setAttribute(Qt::WA_SymbianNoSystemRotation, extra->topextra->noSystemRotationDisabled);
         }
-    } else if (extra->topextra->nativeWindowTransparencyEnabled) {
-        window->SetTransparentRegion(TRegionFix<1>());
-        extra->topextra->nativeWindowTransparencyEnabled = 0;
+        extra->topextra->noSystemRotationDisabled = noSystemRotationDisabled;
     }
 }
 
@@ -1004,6 +1019,7 @@ void QWidgetPrivate::createTLSysExtra()
     extra->topextra->inExpose = 0;
     extra->topextra->nativeWindowTransparencyEnabled = 0;
     extra->topextra->forcedToRaster = 0;
+    extra->topextra->noSystemRotationDisabled = 0;
 }
 
 void QWidgetPrivate::deleteTLSysExtra()