Merge remote-tracking branch 'origin/stable' into dev

For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).

Conflicts:
	configure
	qmake/generators/win32/msvc_nmake.cpp
	src/3rdparty/angle/src/libEGL/Surface.cpp
	src/angle/src/common/common.pri
	src/corelib/global/qglobal.h
	src/corelib/io/qstandardpaths.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxscreeneventhandler.h
	src/plugins/platforms/xcb/qglxintegration.h
	src/widgets/kernel/win.pri
	tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
	tools/configure/configureapp.cpp

Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812

1 files changed, 16 insertions, 6 deletions

diff --git a/src/widgets/styles/qandroidstyle.cpp b/src/widgets/styles/qandroidstyle.cpp
index afd6c3024c..ceb95aa125 100644
--- a/src/widgets/styles/qandroidstyle.cpp
+++ b/src/widgets/styles/qandroidstyle.cpp
@@ -515,8 +515,15 @@ void QAndroidStyle::drawPrimitive(PrimitiveElement pe,
     AndroidControlsHash::const_iterator it = itemType != QC_UnknownType
                                              ? m_androidControlsHash.find(itemType)
                                              : m_androidControlsHash.end();
-    if (it != m_androidControlsHash.end())
-        it.value()->drawControl(opt, p, w);
+    if (it != m_androidControlsHash.end()) {
+        if (itemType != QC_EditText)
+            it.value()->drawControl(opt, p, w);
+        else {
+            QStyleOption copy(*opt);
+            copy.state &= ~QStyle::State_Sunken;
+            it.value()->drawControl(&copy, p, w);
+        }
+    }
     else
         QFusionStyle::drawPrimitive(pe, opt, p, w);
 }
@@ -696,7 +703,10 @@ int QAndroidStyle::styleHint(QStyle::StyleHint hint, const QStyleOption *option,
 {
     switch (hint) {
     case SH_Slider_AbsoluteSetButtons:
-        return 1;
+        return Qt::LeftButton;
+
+    case SH_Slider_PageSetButtons:
+        return 0;
 
     case SH_RequestSoftwareInputPanel:
         return RSIP_OnMouseClick;
@@ -1776,9 +1786,9 @@ QRect QAndroidStyle::AndroidSeekBarControl::subControlRect(const QStyleOptionCom
             drawable = static_cast<const QAndroidStyle::AndroidStateDrawable *>(m_seekBarThumb)->bestAndroidStateMatch(option);
 
         QRect r(option->rect);
-        double factor = double(styleOption->sliderPosition/(styleOption->maximum-styleOption->minimum));
-        int pos=(double(option->rect.width()*factor - drawable->size().width()) / 2);
-        r.setX(r.x()+pos);
+        double factor = double(styleOption->sliderPosition) / (styleOption->maximum - styleOption->minimum);
+        int pos = option->rect.width() * factor - double(drawable->size().width() / 2);
+        r.setX(r.x() + pos);
         r.setSize(drawable->size());
         return r;
     }