Merge remote-tracking branch 'origin/dev' into wip/cmakewip/cmake

Conflicts:
	dependencies.yaml

Change-Id: I8a0df5349aae350fece964ba6411af58e4a2357d

12 files changed, 67 insertions, 16 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 85f18db..3066cd8 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,5 +1,5 @@
 load(qt_build_config)
 
-DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
+DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS
 
 MODULE_VERSION = 6.0.0
diff --git a/dist/changes-5.13.2 b/dist/changes-5.13.2
new file mode 100644
index 0000000..e3bb833
--- /dev/null
+++ b/dist/changes-5.13.2
@@ -0,0 +1,20 @@
+Qt 5.13.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.13.0 through 5.13.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.14.0 b/dist/changes-5.14.0
new file mode 100644
index 0000000..29a2c83
--- /dev/null
+++ b/dist/changes-5.14.0
@@ -0,0 +1,18 @@
+Qt 5.14 introduces many new features and improvements as well as bugfixes
+over the 5.13.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.14 series is binary compatible with the 5.13.x series.
+Applications compiled for 5.13 will continue to run with 5.14.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.14.1 b/dist/changes-5.14.1
new file mode 100644
index 0000000..d008638
--- /dev/null
+++ b/dist/changes-5.14.1
@@ -0,0 +1,20 @@
+Qt 5.14.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.14.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.14 series is binary compatible with the 5.13.x series.
+Applications compiled for 5.13 will continue to run with 5.14.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/src/effects/BrightnessContrast.qml b/src/effects/BrightnessContrast.qml
index a95872c..85b38bb 100644
--- a/src/effects/BrightnessContrast.qml
+++ b/src/effects/BrightnessContrast.qml
@@ -167,8 +167,7 @@ Item {
     SourceProxy {
         id: sourceProxy
         input: rootItem.source
-        interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth)
-            ? SourceProxy.NearestInterpolation :  SourceProxy.LinearInterpolation
+        interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation
     }
 
     ShaderEffectSource {
diff --git a/src/effects/ColorOverlay.qml b/src/effects/ColorOverlay.qml
index b2cdaa0..f348541 100644
--- a/src/effects/ColorOverlay.qml
+++ b/src/effects/ColorOverlay.qml
@@ -123,8 +123,7 @@ Item {
     SourceProxy {
         id: sourceProxy
         input: rootItem.source
-        interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth)
-            ? SourceProxy.NearestInterpolation :  SourceProxy.LinearInterpolation
+        interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation
     }
 
     ShaderEffectSource {
diff --git a/src/effects/Colorize.qml b/src/effects/Colorize.qml
index 501111f..42f1796 100644
--- a/src/effects/Colorize.qml
+++ b/src/effects/Colorize.qml
@@ -210,8 +210,7 @@ Item {
     SourceProxy {
         id: sourceProxy
         input: rootItem.source
-        interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth)
-            ? SourceProxy.NearestInterpolation :  SourceProxy.LinearInterpolation
+        interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation
     }
 
     ShaderEffectSource {
diff --git a/src/effects/Desaturate.qml b/src/effects/Desaturate.qml
index 3347e2f..e56de55 100644
--- a/src/effects/Desaturate.qml
+++ b/src/effects/Desaturate.qml
@@ -122,8 +122,7 @@ Item {
     SourceProxy {
         id: sourceProxy
         input: rootItem.source
-        interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth)
-            ? SourceProxy.NearestInterpolation :  SourceProxy.LinearInterpolation
+        interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation
     }
 
     ShaderEffectSource {
diff --git a/src/effects/GammaAdjust.qml b/src/effects/GammaAdjust.qml
index e4e39e5..2c3edbb 100644
--- a/src/effects/GammaAdjust.qml
+++ b/src/effects/GammaAdjust.qml
@@ -159,8 +159,7 @@ luminance = pow(original_luminance, 1.0 / gamma); // The luminance is assumed to
     SourceProxy {
         id: sourceProxy
         input: rootItem.source
-        interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth)
-            ? SourceProxy.NearestInterpolation :  SourceProxy.LinearInterpolation
+        interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation
     }
 
     ShaderEffectSource {
diff --git a/src/effects/HueSaturation.qml b/src/effects/HueSaturation.qml
index 526f474..eb13dcb 100644
--- a/src/effects/HueSaturation.qml
+++ b/src/effects/HueSaturation.qml
@@ -199,8 +199,7 @@ Item {
     SourceProxy {
         id: sourceProxy
         input: rootItem.source
-        interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth)
-            ? SourceProxy.NearestInterpolation :  SourceProxy.LinearInterpolation
+        interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation
     }
 
     ShaderEffectSource {
diff --git a/src/effects/LevelAdjust.qml b/src/effects/LevelAdjust.qml
index 004c798..b98faca 100644
--- a/src/effects/LevelAdjust.qml
+++ b/src/effects/LevelAdjust.qml
@@ -408,8 +408,7 @@ Item {
     SourceProxy {
         id: sourceProxy
         input: rootItem.source
-        interpolation: rootItem.smooth || (rootItem.layer.enabled && rootItem.layer.smooth)
-            ? SourceProxy.NearestInterpolation :  SourceProxy.LinearInterpolation
+        interpolation: input && input.smooth ? SourceProxy.LinearInterpolation : SourceProxy.NearestInterpolation
     }
 
     ShaderEffectSource {
diff --git a/src/effects/plugins.qmltypes b/src/effects/plugins.qmltypes
index 7c2924c..f805843 100644
--- a/src/effects/plugins.qmltypes
+++ b/src/effects/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtGraphicalEffects 1.13'
+// 'qmlplugindump -nonrelocatable QtGraphicalEffects 1.15'
 
 Module {
     dependencies: ["QtQuick 2.12", "QtQuick.Window 2.12"]