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

Blacklist tst_QMenuBar::taskQTBUG46812_doNotLeaveMenubarHighlighted() on macOS.

Conflicts:
	mkspecs/features/mac/default_post.prf
	mkspecs/features/mac/sdk.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/sdk.prf
	src/angle/src/libEGL/libEGL.pro
	src/platformsupport/fontdatabases/fontdatabases.pro
	src/platformsupport/platformsupport.pro
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	tests/auto/widgets/widgets/qmenubar/BLACKLIST
	tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp

Task-number: QTBUG-56853
Change-Id: If58785210feee3550892fc7768cce90e75a2416c

9 files changed, 20 insertions, 35 deletions

diff --git a/src/3rdparty/freetype/freetype.pro b/src/3rdparty/freetype/freetype.pro
index 6d630d4190..5b1eb92e32 100644
--- a/src/3rdparty/freetype/freetype.pro
+++ b/src/3rdparty/freetype/freetype.pro
@@ -6,6 +6,8 @@ CONFIG += \
     exceptions_off rtti_off warn_off \
     installed
 
+MODULE_INCLUDEPATH += $$PWD/include
+
 load(qt_helper_lib)
 
 SOURCES += \
@@ -61,16 +63,12 @@ win32 {
     INCLUDEPATH += $$PWD/builds/unix
 }
 
-INCLUDEPATH += $$PWD/include
-
 DEFINES += FT2_BUILD_LIBRARY
 
 DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB
 include(../zlib_dependency.pri)
 
-QT_FOR_CONFIG += gui-private
-include($$OUT_PWD/../../gui/qtgui-config.pri)
 DEFINES += FT_CONFIG_OPTION_USE_PNG
-include($$PWD/../png_dependency.pri)
+QMAKE_USE_PRIVATE += libpng
 
 DEFINES += TT_CONFIG_OPTION_SUBPIXEL_HINTING
diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri
deleted file mode 100644
index cf86b66efd..0000000000
--- a/src/3rdparty/freetype_dependency.pri
+++ /dev/null
@@ -1,6 +0,0 @@
-qtConfig(system-freetype) {
-    QMAKE_USE_PRIVATE += freetype/nolink
-} else: qtConfig(freetype) {
-    INCLUDEPATH += $$PWD/freetype/include
-    LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtfreetype$$qtPlatformTargetSuffix()
-}
diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
index 5ec86bf78f..d135b8a9fd 100644
--- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
+++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
@@ -1,10 +1,12 @@
-TARGET = qtharfbuzzng
+TARGET = qtharfbuzz
 
 CONFIG += \
     static \
     hide_symbols \
     exceptions_off rtti_off warn_off
 
+MODULE_INCLUDEPATH += $$PWD/include
+
 load(qt_helper_lib)
 
 # built-in shapers list configuration:
@@ -24,8 +26,6 @@ win32: DEFINES += HB_NO_WIN1256
 #Workaround https://code.google.com/p/android/issues/detail?id=194631
 android: DEFINES += _POSIX_C_SOURCE=200112L
 
-INCLUDEPATH += $$PWD/include
-
 # Harfbuzz-NG inside Qt uses the Qt atomics (inline code only)
 INCLUDEPATH += $$QT.core.includes
 DEFINES += QT_NO_VERSION_TAGGING
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
index 30dde281e8..82977db5e7 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
@@ -156,12 +156,14 @@ static inline void positionCluster(HB_ShaperItem *item, int gfrom,  int glast)
                 // ### wrong in rtl context!
         case HB_Combining_BelowLeft:
             p.y += offset;
+            // fall through
         case HB_Combining_BelowLeftAttached:
             p.x += attachmentRect.x - markMetrics.x;
             p.y += (attachmentRect.y + attachmentRect.height) - markMetrics.y;
             break;
         case HB_Combining_Below:
             p.y += offset;
+            // fall through
         case HB_Combining_BelowAttached:
             p.x += attachmentRect.x - markMetrics.x;
             p.y += (attachmentRect.y + attachmentRect.height) - markMetrics.y;
@@ -170,28 +172,33 @@ static inline void positionCluster(HB_ShaperItem *item, int gfrom,  int glast)
             break;
         case HB_Combining_BelowRight:
             p.y += offset;
+            // fall through
         case HB_Combining_BelowRightAttached:
             p.x += attachmentRect.x + attachmentRect.width - markMetrics.width - markMetrics.x;
             p.y += attachmentRect.y + attachmentRect.height - markMetrics.y;
             break;
         case HB_Combining_Left:
             p.x -= offset;
+            // fall through
         case HB_Combining_LeftAttached:
             break;
         case HB_Combining_Right:
             p.x += offset;
+            // fall through
         case HB_Combining_RightAttached:
             break;
         case HB_Combining_DoubleAbove:
             // ### wrong in RTL context!
         case HB_Combining_AboveLeft:
             p.y -= offset;
+            // fall through
         case HB_Combining_AboveLeftAttached:
             p.x += attachmentRect.x - markMetrics.x;
             p.y += attachmentRect.y - markMetrics.y - markMetrics.height;
             break;
         case HB_Combining_Above:
             p.y -= offset;
+            // fall through
         case HB_Combining_AboveAttached:
             p.x += attachmentRect.x - markMetrics.x;
             p.y += attachmentRect.y - markMetrics.y - markMetrics.height;
@@ -200,6 +207,7 @@ static inline void positionCluster(HB_ShaperItem *item, int gfrom,  int glast)
             break;
         case HB_Combining_AboveRight:
             p.y -= offset;
+            // fall through
         case HB_Combining_AboveRightAttached:
             p.x += attachmentRect.x + attachmentRect.width - markMetrics.x - markMetrics.width;
             p.y += attachmentRect.y - markMetrics.y - markMetrics.height;
diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri
deleted file mode 100644
index 5946f403c5..0000000000
--- a/src/3rdparty/harfbuzz_dependency.pri
+++ /dev/null
@@ -1,6 +0,0 @@
-qtConfig(system-harfbuzz) {
-    QMAKE_USE_PRIVATE += harfbuzz
-} else: qtConfig(harfbuzz) {
-    INCLUDEPATH += $$PWD/harfbuzz-ng/include
-    LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix()
-}
diff --git a/src/3rdparty/libpng/libpng.pro b/src/3rdparty/libpng/libpng.pro
index ab6dd51e2b..577b61d833 100644
--- a/src/3rdparty/libpng/libpng.pro
+++ b/src/3rdparty/libpng/libpng.pro
@@ -1,4 +1,4 @@
-TARGET = qtpng
+TARGET = qtlibpng
 
 CONFIG += \
     static \
@@ -6,6 +6,8 @@ CONFIG += \
     exceptions_off rtti_off warn_off \
     installed
 
+MODULE_INCLUDEPATH = $$PWD
+
 load(qt_helper_lib)
 
 DEFINES += PNG_ARM_NEON_OPT=0
diff --git a/src/3rdparty/pcre/pcre.pro b/src/3rdparty/pcre/pcre.pro
index fad82b80b1..add4a932b3 100644
--- a/src/3rdparty/pcre/pcre.pro
+++ b/src/3rdparty/pcre/pcre.pro
@@ -5,12 +5,14 @@ CONFIG += \
     hide_symbols \
     exceptions_off rtti_off warn_off
 
+win32: MODULE_DEFINES += PCRE_STATIC
+MODULE_INCLUDEPATH += $$PWD
+
 load(qt_helper_lib)
 
 DEFINES += HAVE_CONFIG_H
 
 # platform/compiler specific definitions
-win32: DEFINES += PCRE_STATIC
 uikit|qnx|winrt: DEFINES += PCRE_DISABLE_JIT
 
 SOURCES += \
diff --git a/src/3rdparty/pcre_dependency.pri b/src/3rdparty/pcre_dependency.pri
deleted file mode 100644
index f1355eabe6..0000000000
--- a/src/3rdparty/pcre_dependency.pri
+++ /dev/null
@@ -1,7 +0,0 @@
-qtConfig(system-pcre) {
-    QMAKE_USE_PRIVATE += pcre
-} else {
-    win32: DEFINES += PCRE_STATIC
-    INCLUDEPATH += $$PWD/pcre
-    LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtpcre$$qtPlatformTargetSuffix()
-}
diff --git a/src/3rdparty/png_dependency.pri b/src/3rdparty/png_dependency.pri
deleted file mode 100644
index 50711358a0..0000000000
--- a/src/3rdparty/png_dependency.pri
+++ /dev/null
@@ -1,6 +0,0 @@
-qtConfig(system-png) {
-    QMAKE_USE_PRIVATE += libpng
-} else: qtConfig(png) {
-    INCLUDEPATH += $$PWD/libpng
-    LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtpng$$qtPlatformTargetSuffix()
-}