Merge remote-tracking branch 'origin/5.3' into 5.4

The isAlwaysAskOption was removed in 3862171
so manually removed code in
src/plugins/bearer/connman/qconnmanengine.cpp

Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/tools/qcollator_macx.cpp
	src/corelib/tools/qstring.cpp
	src/gui/kernel/qwindow.cpp
	src/gui/kernel/qwindow_p.h
	src/gui/text/qtextengine.cpp
	src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h
	src/plugins/platforms/android/qandroidinputcontext.cpp
	src/plugins/platforms/xcb/qglxintegration.cpp
	src/plugins/platforms/xcb/qglxintegration.h
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/testlib/qtestcase.cpp
	src/testlib/qtestlog.cpp
	src/widgets/dialogs/qfiledialog.cpp
	src/widgets/kernel/qwindowcontainer.cpp
	tests/auto/corelib/tools/qcollator/tst_qcollator.cpp
	tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
	tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
	tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp

Change-Id: Ic5d4187f682257a17509f6cd28d2836c6cfe2fc8

configure

@@ -195,7 +195,7 @@ expandQMakeConf()
 
 extractQMakeVariables()
 {
-    $AWK '
+    LC_ALL=C $AWK '
 BEGIN {
     values["LITERAL_WHITESPACE"] = " "
     values["LITERAL_DOLLAR"] = "$"

dist/changes-5.3.2

@@ -0,0 +1,98 @@
+Qt 5.3.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.3.0 and Qt 5.3.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.3
+
+The Qt version 5.3 series is binary compatible with the 5.2.x series.
+Applications compiled for 5.2 will continue to run with 5.3.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+QtCore
+------
+
+ - QObject:
+   * [QTBUG-40638] Fixed disconnecting from pointer to member signal that
+     belongs in the base class but whose type is explicitly given as a
+     pointer to a member in the derived class
+
+QtGui
+-----
+
+ - Fonts:
+   * [QTBUG-39846] Fixed regression in font families returned by
+     QFontDatabase::families() for certain writing systems.
+
+ - QImage:
+   * QImage::fill(uint) now fills the given pixel value unconverted when
+     used on RGBA8888 image, making it consistent with the documentation
+     and treatment of all other image formats.
+
+ - Text:
+   * [QTBUG-39832] Fixed lines breaking on non-breaking spaces.
+   * [QTBUG-39930][QTBUG-39860] Fixed several regressions in font selection
+      when combining different writing systems in the same text.
+
+QtNetwork
+---------
+
+ - [QTBUG-30829][QTBUG-35101] Fixed NTLM (SSPI) Proxy Authentication
+   (HTTP/HTTPS)
+
+ - QNetworkAccessManager:
+   * Fixed high CPU load when handling POST/upload QIODevice that generates
+     data on readyRead().
+   * [QTBUG-40797] QNetworkAccessManager now properly handles FTP transfer
+     failures by removing failed cached ftp connections.
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Android
+-------
+
+ - [QTBUG-39978] Fixed regression where QScreen::physicalSize() would
+   return 0x0.
+ - Added support for building libraries with spaces in name.
+ - [QTBUG-39377] Fixed common characters like digits and punctuation
+   showing as boxes when positioned next to non-latin scripts.
+ - [QTBUG-39377] Fixed common characters like digits and punctuation
+   showing as boxes when positioned next to non-latin scripts.
+ - Fixed font selection to prefer "Droid Serif" when Serif style hint is
+   set on QFont.
+ - [QTBUG-40957] Fixed bug on some devices where the application would
+   crash at shutdown if the virtual keyboard was open.
+
+EGLFS
+-----
+
+ - Double click events are now sent correctly on eglfs.
+
+Windows
+-------
+
+ - [QTBUG-39172] Fixed using QRawFont with fallback fonts, e.g. in the case
+   of text rendering in Qt Quick.
+
+X11 / XCB
+---------
+
+ - [QTBUG-39666][QTBUG-39573][QTBUG-39570] QTabletEvents and proximity
+   events correctly identify the tool in use; the meaning of certain
+   valuators depends on the tool; and the valuators' current values are
+   not lost between events

examples/touch/fingerpaint/scribblearea.cpp

@@ -46,6 +46,9 @@
 
 #include "scribblearea.h"
 
+static const qreal MinimumDiameter = 3.0;
+static const qreal MaximumDiameter = 50.0;
+
 //! [0]
 ScribbleArea::ScribbleArea(QWidget *parent)
     : QWidget(parent)
@@ -179,6 +182,7 @@ bool ScribbleArea::event(QEvent *event)
     case QEvent::TouchUpdate:
     case QEvent::TouchEnd:
     {
+        QTouchEvent *touch = static_cast<QTouchEvent *>(event);
         QList<QTouchEvent::TouchPoint> touchPoints = static_cast<QTouchEvent *>(event)->touchPoints();
         foreach (const QTouchEvent::TouchPoint &touchPoint, touchPoints) {
             switch (touchPoint.state()) {
@@ -189,7 +193,9 @@ bool ScribbleArea::event(QEvent *event)
                 {
                     QRectF rect = touchPoint.rect();
                     if (rect.isEmpty()) {
-                        qreal diameter = qreal(50) * touchPoint.pressure();
+                        qreal diameter = MinimumDiameter;
+                        if (touch->device()->capabilities() & QTouchDevice::Pressure)
+                            diameter = MinimumDiameter + (MaximumDiameter - MinimumDiameter) * touchPoint.pressure();
                         rect.setSize(QSizeF(diameter, diameter));
                     }
 

examples/widgets/painting/fontsampler/mainwindow.cpp

@@ -143,7 +143,9 @@ void MainWindow::showFont(QTreeWidgetItem *item)
     QString oldText = textEdit->toPlainText().trimmed();
     bool modified = textEdit->document()->isModified();
     textEdit->clear();
-    textEdit->document()->setDefaultFont(QFont(family, 32, weight, italic));
+    QFont font(family, 32, weight, italic);
+    font.setStyleName(style);
+    textEdit->document()->setDefaultFont(font);
 
     QTextCursor cursor = textEdit->textCursor();
     QTextBlockFormat blockFormat;
@@ -324,6 +326,7 @@ void MainWindow::printPage(int index, QPainter *painter, QPrinter *printer)
         // Calculate the maximum width and total height of the text.
         foreach (int size, sampleSizes) {
             QFont font(family, size, weight, italic);
+            font.setStyleName(style);
             font = QFont(font, painter->device());
             QFontMetricsF fontMetrics(font);
             QRectF rect = fontMetrics.boundingRect(
@@ -357,6 +360,7 @@ void MainWindow::printPage(int index, QPainter *painter, QPrinter *printer)
         // Draw each line of text.
         foreach (int size, sampleSizes) {
             QFont font(family, size, weight, italic);
+            font.setStyleName(style);
             font = QFont(font, painter->device());
             QFontMetricsF fontMetrics(font);
             QRectF rect = fontMetrics.boundingRect(QString("%1 %2").arg(

mkspecs/devices/linux-imx53qsb-g++/qmake.conf

@@ -26,11 +26,8 @@ QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
 QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib
 
 IMX5_CFLAGS             = -march=armv7-a -mfpu=neon -DLINUX=1 -DEGL_API_FB=1 -Wno-psabi
-IMX5_CFLAGS_RELEASE     = -O2 $$IMX5_CFLAGS
-QMAKE_CFLAGS_RELEASE   += $$IMX5_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_RELEASE += $$IMX5_CFLAGS_RELEASE
-QMAKE_CFLAGS_DEBUG     += $$IMX5_CFLAGS
-QMAKE_CXXFLAGS_DEBUG   += $$IMX5_CFLAGS
+QMAKE_CFLAGS           += $$IMX5_CFLAGS
+QMAKE_CXXFLAGS         += $$IMX5_CFLAGS
 
 include(../common/linux_arm_device_post.conf)
 

mkspecs/devices/linux-imx6-g++/qmake.conf

@@ -28,11 +28,8 @@ QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL -lGAL
 QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib
 
 IMX6_CFLAGS             = -march=armv7-a -mfpu=neon -DLINUX=1 -DEGL_API_FB=1
-IMX6_CFLAGS_RELEASE     = -O2 $$IMX6_CFLAGS
-QMAKE_CFLAGS_RELEASE   += $$IMX6_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_RELEASE += $$IMX6_CFLAGS_RELEASE
-QMAKE_CFLAGS_DEBUG     += $$IMX6_CFLAGS
-QMAKE_CXXFLAGS_DEBUG   += $$IMX6_CFLAGS
+QMAKE_CFLAGS           += $$IMX6_CFLAGS
+QMAKE_CXXFLAGS         += $$IMX6_CFLAGS
 
 include(../common/linux_arm_device_post.conf)
 

mkspecs/freebsd-g++/qmake.conf

@@ -12,10 +12,6 @@ QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
 # Addon software goes into /usr/local on the BSDs, by default we will look there
 QMAKE_INCDIR            = /usr/local/include
 QMAKE_LIBDIR            = /usr/local/lib
-QMAKE_INCDIR_X11        = /usr/X11R6/include
-QMAKE_LIBDIR_X11        = /usr/X11R6/lib
-QMAKE_INCDIR_OPENGL     = /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL     = /usr/X11R6/lib
 
 QMAKE_LFLAGS_THREAD     = -pthread
 

mkspecs/freebsd-g++46/qmake.conf

@@ -12,10 +12,6 @@ QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
 # Addon software goes into /usr/local on the BSDs, by default we will look there
 QMAKE_INCDIR            = /usr/local/include
 QMAKE_LIBDIR            = /usr/local/lib
-QMAKE_INCDIR_X11        = /usr/X11R6/include
-QMAKE_LIBDIR_X11        = /usr/X11R6/lib
-QMAKE_INCDIR_OPENGL     = /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL     = /usr/X11R6/lib
 
 QMAKE_LFLAGS_THREAD     = -pthread
 

mkspecs/unsupported/freebsd-clang/qmake.conf

@@ -4,7 +4,6 @@
 
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = freebsd bsd
-CONFIG                 += gdb_dwarf_index
 
 QMAKE_CFLAGS_THREAD     = -pthread -D_THREAD_SAFE
 
@@ -13,10 +12,6 @@ QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
 # Addon software goes into /usr/local on the BSDs, by default we will look there
 QMAKE_INCDIR            = /usr/local/include
 QMAKE_LIBDIR            = /usr/local/lib
-QMAKE_INCDIR_X11        = /usr/X11R6/include
-QMAKE_LIBDIR_X11        = /usr/X11R6/lib
-QMAKE_INCDIR_OPENGL     = /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL     = /usr/X11R6/lib
 
 QMAKE_LFLAGS_THREAD     = -pthread
 

src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java

@@ -366,11 +366,6 @@ protected void onReceiveResult(int resultCode, Bundle resultData) {
         });
     }
 
-    public boolean isSoftwareKeyboardVisible()
-    {
-        return m_keyboardIsVisible;
-    }
-
     String getAppIconSize(Activity a)
     {
         int size = a.getResources().getDimensionPixelSize(android.R.dimen.app_icon_size);

src/android/jar/src/org/qtproject/qt5/android/QtNative.java

@@ -397,25 +397,6 @@ public void run() {
         });
     }
 
-    private static boolean isSoftwareKeyboardVisible()
-    {
-        final Semaphore semaphore = new Semaphore(0);
-        final Boolean[] ret = {false};
-        runAction(new Runnable() {
-            @Override
-            public void run() {
-                ret[0] = m_activityDelegate.isSoftwareKeyboardVisible();
-                semaphore.release();
-            }
-        });
-        try {
-            semaphore.acquire();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return ret[0];
-    }
-
     private static void setFullScreen(final boolean fullScreen)
     {
         runAction(new Runnable() {

src/angle/src/common/common.pri

@@ -7,6 +7,11 @@ INCLUDEPATH += \
 
 LIBS_PRIVATE = $$QMAKE_LIBS_CORE $$QMAKE_LIBS_GUI
 
+lib_replace.match = $$[QT_INSTALL_LIBS/get]
+lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
+lib_replace.CONFIG = path
+QMAKE_PRL_INSTALL_REPLACE += lib_replace
+
 # DirectX is included in the Windows 8 Kit, but everything else requires the DX SDK.
 win32-msvc2012|win32-msvc2013|winrt {
     FXC = fxc.exe

src/corelib/arch/qatomic_mips.h

@@ -121,7 +121,7 @@ void QBasicAtomicOps<size>::releaseMemoryFence(const T &) Q_DECL_NOTHROW
 {
     asm volatile (".set push\n"
                   ".set mips32\n"
-                  "sync 0x11\n"
+                  "sync 0x12\n"
                   ".set pop\n" ::: "memory");
 }
 

src/corelib/global/qlogging.cpp

@@ -1345,12 +1345,9 @@ static void qDefaultMsgHandler(QtMsgType type, const char *buf)
     qDefaultMessageHandler(type, emptyContext, QString::fromLocal8Bit(buf));
 }
 
-#if defined(Q_COMPILER_THREAD_LOCAL) || (defined(Q_CC_MSVC) && !defined(Q_OS_WINCE))
-#if defined(Q_CC_MSVC)
-static __declspec(thread) bool msgHandlerGrabbed = false;
-#else
+#if defined(Q_COMPILER_THREAD_LOCAL)
+
 static thread_local bool msgHandlerGrabbed = false;
-#endif
 
 static bool grabMessageHandler()
 {
@@ -1369,7 +1366,7 @@ static void ungrabMessageHandler()
 #else
 static bool grabMessageHandler() { return true; }
 static void ungrabMessageHandler() { }
-#endif // (Q_COMPILER_THREAD_LOCAL) || ((Q_CC_MSVC) && !(Q_OS_WINCE))
+#endif // (Q_COMPILER_THREAD_LOCAL)
 
 static void qt_message_print(QtMsgType msgType, const QMessageLogContext &context, const QString &message)
 {

src/corelib/global/qnamespace.qdoc

@@ -125,7 +125,7 @@
            to author a plugin. This includes avoiding loading our nib for the main
            menu and not taking possession of the native menu bar. When setting this
            attribute to true will also set the AA_DontUseNativeMenuBar attribute
-           to true.
+           to true. It also disables native event filters.
 
     \value AA_DontUseNativeMenuBar All menubars created while this attribute is
            set to true won't be used as a native menubar (e.g, the menubar at

src/corelib/global/qprocessordetection.h

@@ -169,6 +169,7 @@
 #elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
 #  define Q_PROCESSOR_X86_32
 #  define Q_BYTE_ORDER Q_LITTLE_ENDIAN
+#  define Q_PROCESSOR_WORDSIZE   4
 
 /*
  * We define Q_PROCESSOR_X86 == 6 for anything above a equivalent or better

src/corelib/io/qdir_p.h

@@ -42,6 +42,17 @@
 #ifndef QDIR_P_H
 #define QDIR_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qfilesystementry_p.h"
 #include "qfilesystemmetadata_p.h"
 

src/corelib/io/qfile.cpp

@@ -167,7 +167,7 @@ QAbstractFileEngine *QFilePrivate::engine() const
     disk into a 16-bit Unicode QString. By default, it assumes that
     the user system's local 8-bit encoding is used (e.g., UTF-8
     on most unix based operating systems; see QTextCodec::codecForLocale() for
-    details). This can be changed using setCodec().
+    details). This can be changed using \l QTextStream::setCodec().
 
     To write text, we can use operator<<(), which is overloaded to
     take a QTextStream on the left and various data types (including
@@ -987,8 +987,8 @@ bool QFile::open(FILE *fh, OpenMode mode, FileHandleFlags handleFlags)
     those cases, size() returns \c 0.  See QIODevice::isSequential()
     for more information.
 
-    \warning For Windows CE you may not be able to call seek(), setSize(),
-    fileTime(). size() returns \c 0.
+    \warning For Windows CE you may not be able to call seek(), and size()
+             returns \c 0.
 
     \warning Since this function opens the file without specifying the file name,
              you cannot use this QFile with a QFileInfo.

src/corelib/io/qfiledevice.cpp

@@ -269,7 +269,7 @@ int QFileDevice::handle() const
 
 /*!
     Returns the name of the file.
-    The default implementation in QFileDevice returns QString().
+    The default implementation in QFileDevice returns a null string.
 */
 QString QFileDevice::fileName() const
 {

src/corelib/io/qfilesystemwatcher_fsevents.mm

@@ -496,6 +496,7 @@ static void callBackFunction(ConstFSEventStreamRef streamRef,
 bool QFseventsFileSystemWatcherEngine::startStream()
 {
     Q_ASSERT(stream == 0);
+    Q_AUTORELEASE_POOL(pool)
     if (stream) // This shouldn't happen, but let's be nice and handle it.
         stopStream();
 

src/corelib/io/qfsfileengine.cpp

@@ -752,6 +752,9 @@ qint64 QFSFileEnginePrivate::writeFdFh(const char *data, qint64 len)
     if (len &&  writtenBytes == 0) {
         writtenBytes = -1;
         q->setError(errno == ENOSPC ? QFile::ResourceError : QFile::WriteError, qt_error_string(errno));
+    } else {
+        // reset the cached size, if any
+        metaData.clearFlags(QFileSystemMetaData::SizeAttribute);
     }
 
     return writtenBytes;