Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev

5 files changed, 28 insertions, 15 deletions

diff --git a/src/gui/configure.json b/src/gui/configure.json
index d074bf6794..7c4ea48f2e 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -87,7 +87,8 @@
             "test": "qpa/kms",
             "sources": [
                 { "type": "pkgConfig", "args": "libdrm" },
-                "-ldrm"
+                { "libs": "-ldrm", "condition": "!config.integrity" },
+                { "libs": "-ldrm-nvdc -lposix -livfs -lnvll -lnvdc -lnvrm -lnvrm_graphics -lnvos -lnvtegrahv", "condition": "config.integrity" }
             ]
         },
         "egl": {
@@ -150,6 +151,13 @@
                 { "type": "pkgConfig", "args": "libinput" }
             ]
         },
+        "integrityhid": {
+            "label": "integrityhid",
+            "test": "qpa/integrityhid",
+            "sources": [
+                { "libs": "-lhiddev -lusbhid -lusb" }
+            ]
+        },
         "libjpeg": {
             "label": "libjpeg",
             "test": "unix/libjpeg",
@@ -379,6 +387,11 @@
             "type": "compile",
             "test": "unix/evdev"
         },
+        "integrityfb": {
+            "label": "INTEGRITY framebuffer",
+            "type": "compile",
+            "test": "qpa/integrityfb"
+        },
         "libinput_axis_api": {
             "label": "axis API in libinput",
             "type": "compile",
@@ -447,7 +460,6 @@
         "combined-angle-lib": {
             "label": "Combined ANGLE Library",
             "autoDetect": false,
-            "enable": "features.angle",
             "condition": "features.angle",
             "output": [ "publicFeature" ]
         },
@@ -526,7 +538,7 @@
         "integrityfb": {
             "label": "INTEGRITY framebuffer",
             "section": "Platform plugins",
-            "condition": "config.integrity",
+            "condition": "config.integrity && tests.integrityfb",
             "output": [ "privateFeature" ]
         },
         "kms": {
@@ -539,6 +551,11 @@
             "condition": "features.libudev && libs.libinput",
             "output": [ "privateFeature" ]
         },
+        "integrityhid": {
+            "label": "INTEGRITY HID",
+            "condition": "config.integrity && libs.integrityhid",
+            "output": [ "privateFeature" ]
+        },
         "libinput-axis-api": {
             "label": "axis API in libinput",
             "condition": "features.libinput && tests.libinput_axis_api",
@@ -1144,6 +1161,7 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla
             "entries": [
                 "evdev",
                 "libinput",
+                "integrityhid",
                 "mtdev",
                 "tslib",
                 "xkbcommon-evdev"
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index bac00f7e95..76aba944b2 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -10,7 +10,6 @@ HEADERS += \
         image/qimageiohandler.h \
         image/qimagereader.h \
         image/qimagewriter.h \
-        image/qmovie.h \
         image/qpaintengine_pic_p.h \
         image/qpicture.h \
         image/qpicture_p.h \
@@ -41,7 +40,6 @@ SOURCES += \
         image/qpixmap.cpp \
         image/qpixmapcache.cpp \
         image/qplatformpixmap.cpp \
-        image/qmovie.cpp \
         image/qpixmap_raster.cpp \
         image/qpixmap_blitter.cpp \
         image/qimagepixmapcleanuphooks.cpp \
@@ -50,6 +48,10 @@ SOURCES += \
         image/qiconengine.cpp \
         image/qiconengineplugin.cpp \
 
+qtConfig(movie) {
+    HEADERS += image/qmovie.h
+    SOURCES += image/qmovie.cpp
+}
 
 win32:!winrt: SOURCES += image/qpixmap_win.cpp
 
diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index 3889b747db..2ff9fb4e36 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -174,8 +174,6 @@
 
 #include "qmovie.h"
 
-#ifndef QT_NO_MOVIE
-
 #include "qglobal.h"
 #include "qimage.h"
 #include "qimagereader.h"
@@ -1062,5 +1060,3 @@ void QMovie::setCacheMode(CacheMode cacheMode)
 QT_END_NAMESPACE
 
 #include "moc_qmovie.cpp"
-
-#endif // QT_NO_MOVIE
diff --git a/src/gui/image/qmovie.h b/src/gui/image/qmovie.h
index ab8ef82aa0..ca559d491b 100644
--- a/src/gui/image/qmovie.h
+++ b/src/gui/image/qmovie.h
@@ -42,15 +42,14 @@
 
 #include <QtGui/qtguiglobal.h>
 
-#ifndef QT_NO_MOVIE
-
 #include <QtCore/qobject.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qlist.h>
 #include <QtGui/qimagereader.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(movie);
 
+QT_BEGIN_NAMESPACE
 
 class QByteArray;
 class QColor;
@@ -146,6 +145,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_MOVIE
-
 #endif // QMOVIE_H
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 31225f0902..4519c4af19 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -6013,7 +6013,7 @@ DrawHelper qDrawHelper[QImage::NImageFormats] =
     // Format_ARGB32,
     {
         blend_color_generic,
-        qt_gradient_argb32,
+        blend_src_generic,
         qt_bitmapblit_argb32,
         qt_alphamapblit_argb32,
         qt_alphargbblit_argb32,