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

Conflicts: .qmake.conf src/corelib/doc/src/objectmodel/signalsandslots.qdoc src/plugins/platforms/cocoa/qcocoamenuloader.mm src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp tests/auto/gui/image/qimage/tst_qimage.cpp Done-with: Gatis Paeglis <[email protected]> Change-Id: I9bd24ee9b00d4f26c8f344ce3970aa6e93935ff5
zoldalis · Aug 7, 2018 · 053e7cc · 053e7cc
2 parents a420d02 + f271dd8
commit 053e7cc
Show file tree

Hide file tree

Showing 57 changed files with 848 additions and 506 deletions.
diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc
@@ -520,7 +520,7 @@
     \title Qt Creator: Adding Debuggers
 */
 /*!
-    \externalpage http://doc.qt.io/qtcreator/qtcreator-accelbubble-example.html
+    \externalpage http://doc.qt.io/qtcreator/qt-creator-accelbubble-example.html
     \title Qt Creator: Creating a Mobile Application
 */
 /*!

diff --git a/doc/src/images/sliders-example.png b/doc/src/images/sliders-example.png
diff --git a/examples/widgets/tools/plugandpaint/app/interfaces.h b/examples/widgets/tools/plugandpaint/app/interfaces.h
@@ -106,16 +106,16 @@ class FilterInterface
 
 QT_BEGIN_NAMESPACE
 //! [3] //! [4]
-#define BrushInterface_iid "org.qt-project.Qt.Examples.PlugAndPaint.BrushInterface"
+#define BrushInterface_iid "org.qt-project.Qt.Examples.PlugAndPaint.BrushInterface/1.0"
 
 Q_DECLARE_INTERFACE(BrushInterface, BrushInterface_iid)
 //! [3]
 
-#define ShapeInterface_iid  "org.qt-project.Qt.Examples.PlugAndPaint.ShapeInterface"
+#define ShapeInterface_iid  "org.qt-project.Qt.Examples.PlugAndPaint.ShapeInterface/1.0"
 
 Q_DECLARE_INTERFACE(ShapeInterface, ShapeInterface_iid)
 //! [5]
-#define FilterInterface_iid "org.qt-project.Qt.Examples.PlugAndPaint.FilterInterface"
+#define FilterInterface_iid "org.qt-project.Qt.Examples.PlugAndPaint.FilterInterface/1.0"
 
 Q_DECLARE_INTERFACE(FilterInterface, FilterInterface_iid)
 //! [4] //! [5]

diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
@@ -18,7 +18,7 @@ include(g++-base.conf)
 MAKEFILE_GENERATOR      = MINGW
 QMAKE_PLATFORM          = win32 mingw
 CONFIG                 += debug_and_release debug_and_release_target precompile_header
-DEFINES                += UNICODE _UNICODE WIN32
+DEFINES                += UNICODE _UNICODE WIN32 MINGW_HAS_SECURE_API=1
 QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32
 # can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for
 # x86_64 platform similar to 'msvc-desktop.conf' toolchain, because, unlike for MSVC,

diff --git a/qmake/Makefile.unix.win32 b/qmake/Makefile.unix.win32
@@ -1,5 +1,5 @@
 EXEEXT = .exe
-EXTRA_CXXFLAGS = -DUNICODE
+EXTRA_CXXFLAGS = -DUNICODE -DMINGW_HAS_SECURE_API=1
 EXTRA_LFLAGS = -static -s -lole32 -luuid -ladvapi32 -lkernel32 -lnetapi32
 QTOBJS = \
     qfilesystemengine_win.o \

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
@@ -2873,7 +2873,16 @@ MakefileGenerator::escapeDependencyPath(const QString &path) const
     QString ret = path;
     if (!ret.isEmpty()) {
         // Unix make semantics, to be inherited by unix and mingw generators.
+#ifdef Q_OS_UNIX
+        // When running on Unix, we need to escape colons (which may appear
+        // anywhere in a path, and would be mis-parsed as dependency separators).
         static const QRegExp criticalChars(QStringLiteral("([\t :#])"));
+#else
+        // MinGW make has a hack for colons which denote drive letters, and no
+        // other colons may appear in paths. And escaping colons actually breaks
+        // the make from the Android SDK.
+        static const QRegExp criticalChars(QStringLiteral("([\t #])"));
+#endif
         ret.replace(criticalChars, QStringLiteral("\\\\1"));
         debug_msg(2, "escapeDependencyPath: %s -> %s", path.toLatin1().constData(), ret.toLatin1().constData());
     }

diff --git a/qmake/qmake.pri b/qmake/qmake.pri