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

Conflicts: config_help.txt configure src/corelib/io/qprocess_wince.cpp src/plugins/platforms/windows/qwindowstheme.cpp src/plugins/platforms/xcb/qxcbbackingstore.cpp tests/auto/corelib/tools/qtimezone/BLACKLIST tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: I26644d1cb3b78412c8ff285e2a55bea1bd641c01
dougcooper · May 12, 2016 · 9909696 · 9909696
2 parents a213011 + e64b223
commit 9909696
Show file tree

Hide file tree

Showing 882 changed files with 75,296 additions and 25,868 deletions.
diff --git a/.gitignore b/.gitignore
@@ -226,7 +226,6 @@ config.tests/unix/sse2/sse2
 # ---------------------
 
 debug
-examples/tools/plugandpaint/plugins
 include/*
 include/*/*
 lib/*

diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
@@ -77,7 +77,24 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1
 # Make sure output from possible previous tests is gone
 rm -f "$EXE" "${EXE}.exe"
 
-set -- "$QMAKE" -qtconf "$QTCONF" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS+=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CFLAGS*=$CFLAGS" "QMAKE_CFLAGS+=$MAC_ARCH_CFLAGS" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" $QMAKE_ARGS "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
+set -- \
+    "$QMAKE" \
+     -qtconf "$QTCONF" \
+     -nocache \
+     -spec "$QMKSPEC" \
+     "CONFIG+=$QMAKE_CONFIG" \
+     "CONFIG+=android_app" \
+     "CONFIG-=debug_and_release app_bundle lib_bundle" \
+     "LIBS+=$LFLAGS" \
+     "LIBS+=$MAC_ARCH_LFLAGS" \
+     "INCLUDEPATH*=$INCLUDEPATH" \
+     "QMAKE_CFLAGS*=$CFLAGS" \
+     "QMAKE_CFLAGS+=$MAC_ARCH_CFLAGS" \
+     "QMAKE_CXXFLAGS*=$CXXFLAGS" \
+     "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" \
+     $QMAKE_ARGS \
+     "$SRCDIR/$TEST/$EXE.pro" \
+     -o "$OUTDIR/$TEST/Makefile"
 if [ "$VERBOSE" = "yes" ]; then
     OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes
 else

diff --git a/config.tests/unix/freetype/freetype.cpp b/config.tests/unix/freetype/freetype.cpp
@@ -40,7 +40,7 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20110)
+#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20200)
 #  error "This version of freetype is too old."
 #endif
 

diff --git a/config.tests/win/directwrite2/directwrite2.cpp b/config.tests/win/directwrite2/directwrite2.cpp
@@ -43,6 +43,7 @@
 int main(int, char**)
 {
     IUnknown *factory = 0;
+    const size_t dummy = size_t(DWRITE_E_NOCOLOR) + sizeof(IDWriteFontFace2);
     DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED,
                         __uuidof(IDWriteFactory2),
                         &factory);

diff --git a/config_help.txt b/config_help.txt
@@ -325,8 +325,8 @@ Additional options:
     -no-gbm .............. Do not compile backends for GBM.
  *  -gbm ................. Compile backends for GBM.
 
-    -no-directfb ......... Do not compile DirectFB support.
- *  -directfb ............ Compile DirectFB support.
+ *  -no-directfb ......... Do not compile DirectFB support.
+    -directfb ............ Compile DirectFB support.
 
     -no-linuxfb .......... Do not compile Linux Framebuffer support.
  *  -linuxfb ............. Compile Linux Framebuffer support.

diff --git a/configure b/configure
@@ -679,7 +679,7 @@ CFG_EGLFS_EGLDEVICE=no
 CFG_EGLFS_MALI=no
 CFG_EGLFS_VIV=no
 CFG_EGLFS_VIV_WL=no
-CFG_DIRECTFB=auto
+CFG_DIRECTFB=no
 CFG_GBM=auto
 CFG_LINUXFB=auto
 CFG_INTEGRITYFB=no
@@ -3238,7 +3238,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
             setBootstrapVariable QMAKE_CXXFLAGS_RELEASE
             EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_RELEASE)"
             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)"
-        elif [ "$CFG_DEBUG" = "yes" ]; then
+        else
             setBootstrapVariable QMAKE_CFLAGS_DEBUG
             setBootstrapVariable QMAKE_CXXFLAGS_DEBUG
             EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)"
@@ -3719,10 +3719,12 @@ if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then
     fi
 
     # Detect objcopy support
-    if ! compileTest unix/objcopy "objcopy"; then
-        echo "ERROR: -separate-debug-info was requested but this binutils does not support it."
-        echo "Re-run configure with -v for more information"
-        exit 1
+    if [ "$XPLATFORM_MAC" = "no" ]; then
+        if ! compileTest unix/objcopy "objcopy"; then
+            echo "ERROR: -separate-debug-info was requested but this binutils does not support it."
+            echo "Re-run configure with -v for more information"
+            exit 1
+        fi
     fi
 fi
 
@@ -6074,7 +6076,6 @@ fi
 QTCONFIG="$outpath/mkspecs/qconfig.pri"
 exec > "$QTCONFIG.tmp"
 
-QTCONFIG_CONFIG="$QTCONFIG_CONFIG no_mocdepend"
 if [ "$CFG_DEBUG" = "yes" ]; then
     QTCONFIG_CONFIG="$QTCONFIG_CONFIG debug"
     if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then

diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf
@@ -45,11 +45,7 @@ manifestmeta.highlighted.names      =   "QtQuick/Qt Quick Demo - Same Game" \
                                         "QtQuickExtras/Qt Quick Extras - Dashboard" \
                                         "QtQuickExtras/Qt Quick Extras - Flat" \
                                         "QtQuickExtras/Qt Quick Extras - Gallery" \
-                                        "QtQuickControls/Qt Quick Controls - Gallery" \
-                                        "QtQuickControls/Qt Quick Controls - Text Editor Example" \
-                                        "QtQuickControls/Qt Quick Controls - Table View Example" \
-                                        "QtQuickControls/Qt Quick Controls - Calendar Example" \
-                                        "QtQuickControls/Qt Quick Controls - File System Browser Example" \
+                                        "QtQuickControls2/Qt Quick Controls 2 - Gallery" \
                                         "QtQuickDialogs/Qt Quick System Dialog Examples" \
                                         "QtWinExtras/Quick Player" \
                                         "QtMultimedia/QML Video Shader Effects Example" \
@@ -59,26 +55,6 @@ manifestmeta.highlighted.names      =   "QtQuick/Qt Quick Demo - Same Game" \
 
 manifestmeta.highlighted.attributes =   isHighlighted:true
 
-# Add 'webkit1' tag for QtWebKit1 examples
-manifestmeta.webkit1.names          =  "QtWebKitExamples/Tab Browser" \
-                                       "QtWebKitExamples/DOM Traversal Example" \
-                                       "QtWebKitExamples/Fancy Browser Example" \
-                                       "QtWebKitExamples/Form Extractor Example" \
-                                       "QtWebKitExamples/WebKit Frame Capture Example" \
-                                       "QtWebKitExamples/The Webkit Bridge Tutorial*" \
-                                       "QtWebKitExamples/Previewer Example" \
-                                       "QtWebKitExamples/Wheel Scroller Example" \
-                                       "QtWebKitExamples/Simple Selector Example" \
-                                       "QtWebKitExamples/QObject XML Model Example"
-
-manifestmeta.webkit1.tags           =   webkit1
-
-# Add 'webkit2' tag for QtWebKit2 examples
-manifestmeta.webkit2.names          =  "QtWebKitExamples/Flickr View Example" \
-                                       "QtWebKitExamples/YouTube View Example"
-
-manifestmeta.webkit2.tags           =   webkit2
-
 manifestmeta.android.names          =  "QtQuick/Qt Quick Demo - Maroon*" \
                                        "QtQuick/Qt Quick Demo - Calqlatr" \
                                        "QtWidgets/Application Chooser Example" \

diff --git a/examples/corelib/mimetypes/doc/images/mimetypebrowser.png b/examples/corelib/mimetypes/doc/images/mimetypebrowser.png
diff --git a/examples/corelib/mimetypes/doc/src/mimetypebrowser.qdoc b/examples/corelib/mimetypes/doc/src/mimetypebrowser.qdoc
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example mimetypes/mimetypebrowser
+    \ingroup examples-mimetype
+    \title MIME Type Browser Example
+
+    \brief Shows the hierarchy of MIME types and
+    can be used to determine the MIME type of a file.
+
+    \image mimetypebrowser.png Screenshot of the MIME Type Browser Example
+
+    \e {MIME Type Browser} is intended to be a tool for exploring MIME types
+    rather than an example showing the typical usage of Qt's MIME API.
+
+    \include examples-run.qdocinc
+
+    \section1 Main Window
+
+    The main window consists of a tree view displaying the hierarchy of MIME types
+    based on the model MimetypeModel inheriting QStandardItemModel on the left and
+    a QTextBrowser for showing detailed information about the selected MIME type
+    on the right.
+
+    It has a main menu with an option \uicontrol{File/Detect File Type}, which
+    lets you pick a file and then displays its MIME type.
+
+    For more information, see QMimeType and QMimeDatabase.
+*/
diff --git a/examples/corelib/threads/queuedcustomtype/queuedcustomtype.pro b/examples/corelib/threads/queuedcustomtype/queuedcustomtype.pro
@@ -8,7 +8,7 @@ SOURCES   = main.cpp \
 QT += widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/corelib/threads/mandelbrot
+target.path = $$[QT_INSTALL_EXAMPLES]/corelib/threads/queuedcustomtype
 INSTALLS += target
 
 
diff --git a/examples/corelib/threads/queuedcustomtype/window.h b/examples/corelib/threads/queuedcustomtype/window.h
@@ -54,8 +54,10 @@
 #include <QWidget>
 #include "renderthread.h"
 
+QT_BEGIN_NAMESPACE
 class QLabel;
 class QPushButton;
+QT_END_NAMESPACE
 
 //! [Window class definition]
 class Window : public QWidget

diff --git a/examples/corelib/threads/threads.pro b/examples/corelib/threads/threads.pro
@@ -4,4 +4,6 @@ CONFIG += no_docs_target
 SUBDIRS       = semaphores \
                 waitconditions
 
-qtHaveModule(widgets): SUBDIRS += mandelbrot
+qtHaveModule(widgets): SUBDIRS += \
+    mandelbrot \
+    queuedcustomtype
diff --git a/examples/corelib/tools/customtype/customtype.pro b/examples/corelib/tools/customtype/customtype.pro
@@ -4,5 +4,5 @@ SOURCES   = main.cpp \
 QT += widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/corelib/tools/customcompleter
+target.path = $$[QT_INSTALL_EXAMPLES]/corelib/tools/customtype
 INSTALLS += target
diff --git a/examples/corelib/tools/customtypesending/customtypesending.pro b/examples/corelib/tools/customtypesending/customtypesending.pro
@@ -6,5 +6,5 @@ SOURCES   = main.cpp \
 QT += widgets
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/corelib/tools/customcompleter
+target.path = $$[QT_INSTALL_EXAMPLES]/corelib/tools/customtypesending
 INSTALLS += target
diff --git a/examples/opengl/contextinfo/contextinfo.pro b/examples/opengl/contextinfo/contextinfo.pro
@@ -7,3 +7,7 @@ SOURCES += main.cpp \
 
 HEADERS += widget.h \
            renderwindow.h
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/contextinfo
+INSTALLS += target
diff --git a/examples/opengl/contextinfo/main.cpp b/examples/opengl/contextinfo/main.cpp
@@ -53,6 +53,15 @@
 
 int main(int argc, char **argv)
 {
+    for (int i = 1; i < argc; ++i) {
+        if (!qstrcmp(argv[i], "-g"))
+            QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
+        else if (!qstrcmp(argv[i], "-s"))
+            QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
+        else if (!qstrcmp(argv[i], "-d"))
+            QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
+    }
+
     QApplication app(argc, argv);
 
     Widget w;

diff --git a/examples/opengl/contextinfo/widget.cpp b/examples/opengl/contextinfo/widget.cpp
@@ -60,10 +60,12 @@
 #include <QPushButton>
 #include <QTextEdit>
 #include <QSplitter>
+#include <QGuiApplication>
 #include <QSurfaceFormat>
 #include <QOpenGLContext>
 #include <QOpenGLFunctions>
 #include <QDebug>
+#include <QTextStream>
 
 struct Version {
     const char *str;
@@ -235,6 +237,24 @@ Widget::Widget(QWidget *parent)
     m_renderWindowContainer = new QWidget;
     addRenderWindow();
 
+    QString description;
+    QTextStream str(&description);
+    str << "Qt " << QT_VERSION_STR << ' ' << QGuiApplication::platformName();
+    const char *openGlVariables[] =
+        {"QT_ANGLE_PLATFORM", "QT_OPENGL", "QT_OPENGL_BUGLIST", "QT_OPENGL_DLL"};
+    const size_t variableCount = sizeof(openGlVariables) / sizeof(openGlVariables[0]);
+    for (size_t v = 0; v < variableCount; ++v) {
+        if (qEnvironmentVariableIsSet(openGlVariables[v]))
+            str << ' ' << openGlVariables[v] << '=' << qgetenv(openGlVariables[v]);
+    }
+    if (QCoreApplication::testAttribute(Qt::AA_UseOpenGLES))
+        str << " Qt::AA_UseOpenGLES";
+    if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL))
+        str << " Qt::AA_UseSoftwareOpenGL";
+    if (QCoreApplication::testAttribute(Qt::AA_UseDesktopOpenGL))
+        str << " Qt::AA_UseSoftwareOpenGL";
+    layout->addWidget(new QLabel(description));
+
     setLayout(layout);
 }
 

diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro
@@ -16,3 +16,6 @@ qtHaveModule(widgets) {
                 textures \
                 hellogles3
 }
+
+EXAMPLE_FILES += \
+    legacy