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

Conflicts:
	.qmake.conf

Change-Id: Iaee160172f27e36a8fa7c46a9f2154c6864d93de

3 files changed, 124 insertions, 67 deletions

diff --git a/src/effects/ConicalGradient.qml b/src/effects/ConicalGradient.qml
index c86a832..d0ca1df 100644
--- a/src/effects/ConicalGradient.qml
+++ b/src/effects/ConicalGradient.qml
@@ -206,41 +206,60 @@ Item {
     \row
         \li \b {gradient:} \code
 Gradient {
-  GradientStop { position: 0.000
-  color: Qt.rgba(1, 0, 0, 1) }
-  GradientStop { position: 0.167;
-  color: Qt.rgba(1, 1, 0, 1) }
-  GradientStop { position: 0.333;
-  color: Qt.rgba(0, 1, 0, 1) }
-  GradientStop { position: 0.500;
-  color: Qt.rgba(0, 1, 1, 1) }
-  GradientStop { position: 0.667;
-  color: Qt.rgba(0, 0, 1, 1) }
-  GradientStop { position: 0.833;
-  color: Qt.rgba(1, 0, 1, 1) }
-  GradientStop { position: 1.000;
-  color: Qt.rgba(1, 0, 0, 1) }
+  GradientStop {
+     position: 0.000
+     color: Qt.rgba(1, 0, 0, 1)
+  }
+  GradientStop {
+     position: 0.167
+     color: Qt.rgba(1, 1, 0, 1)
+  }
+  GradientStop {
+     position: 0.333
+     color: Qt.rgba(0, 1, 0, 1)
+  }
+  GradientStop {
+     position: 0.500
+     color: Qt.rgba(0, 1, 1, 1)
+  }
+  GradientStop {
+     position: 0.667
+     color: Qt.rgba(0, 0, 1, 1)
+  }
+  GradientStop {
+     position: 0.833
+     color: Qt.rgba(1, 0, 1, 1)
+  }
+  GradientStop {
+     position: 1.000
+     color: Qt.rgba(1, 0, 0, 1)
+  }
 }
     \endcode
         \li \b {gradient:} \code
 Gradient {
-  GradientStop { position: 0.0
-  color: "#F0F0F0"
+  GradientStop {
+     position: 0.0
+     color: "#F0F0F0"
   }
-  GradientStop { position: 0.5
-  color: "#000000"
+  GradientStop {
+     position: 0.5
+     color: "#000000"
   }
-  GradientStop { position: 1.0
-  color: "#F0F0F0"
+  GradientStop {
+     position: 1.0
+     color: "#F0F0F0"
   }
 }
     \endcode
         \li \b {gradient:} \code
 Gradient {
-  GradientStop { position: 0.0
-    color: "#00000000"
+  GradientStop {
+     position: 0.0
+     color: "#00000000"
   }
-  GradientStop { position: 1.0
+  GradientStop {
+    position: 1.0
     color: "#FF000000"
   }
 }
diff --git a/src/effects/LinearGradient.qml b/src/effects/LinearGradient.qml
index 5c52f6c..49adab8 100644
--- a/src/effects/LinearGradient.qml
+++ b/src/effects/LinearGradient.qml
@@ -194,41 +194,60 @@ Item {
             \row
             \li \b {gradient:} \code
     Gradient {
-      GradientStop { position: 0.000
-      color: Qt.rgba(1, 0, 0, 1) }
-      GradientStop { position: 0.167;
-      color: Qt.rgba(1, 1, 0, 1) }
-      GradientStop { position: 0.333;
-      color: Qt.rgba(0, 1, 0, 1) }
-      GradientStop { position: 0.500;
-      color: Qt.rgba(0, 1, 1, 1) }
-      GradientStop { position: 0.667;
-      color: Qt.rgba(0, 0, 1, 1) }
-      GradientStop { position: 0.833;
-      color: Qt.rgba(1, 0, 1, 1) }
-      GradientStop { position: 1.000;
-      color: Qt.rgba(1, 0, 0, 1) }
+      GradientStop {
+         position: 0.000
+         color: Qt.rgba(1, 0, 0, 1)
+      }
+      GradientStop {
+         position: 0.167
+         color: Qt.rgba(1, 1, 0, 1)
+      }
+      GradientStop {
+         position: 0.333
+         color: Qt.rgba(0, 1, 0, 1)
+      }
+      GradientStop {
+         position: 0.500
+         color: Qt.rgba(0, 1, 1, 1)
+      }
+      GradientStop {
+         position: 0.667
+         color: Qt.rgba(0, 0, 1, 1)
+      }
+      GradientStop {
+         position: 0.833
+         color: Qt.rgba(1, 0, 1, 1)
+      }
+      GradientStop {
+         position: 1.000
+         color: Qt.rgba(1, 0, 0, 1)
+      }
     }
         \endcode
             \li \b {gradient:} \code
     Gradient {
-      GradientStop { position: 0.0
-      color: "#F0F0F0"
+      GradientStop {
+        position: 0.0
+        color: "#F0F0F0"
       }
-      GradientStop { position: 0.5
-      color: "#000000"
+      GradientStop {
+        position: 0.5
+        color: "#000000"
       }
-      GradientStop { position: 1.0
-      color: "#F0F0F0"
+      GradientStop {
+        position: 1.0
+        color: "#F0F0F0"
       }
     }
         \endcode
             \li \b {gradient:} \code
     Gradient {
-      GradientStop { position: 0.0
+      GradientStop {
+        position: 0.0
         color: "#00000000"
       }
-      GradientStop { position: 1.0
+      GradientStop {
+        position: 1.0
         color: "#FF000000"
       }
     }
diff --git a/src/effects/RadialGradient.qml b/src/effects/RadialGradient.qml
index 5196ba2..06318ab 100644
--- a/src/effects/RadialGradient.qml
+++ b/src/effects/RadialGradient.qml
@@ -265,42 +265,61 @@ Item {
         \row
             \li \b {gradient:} \code
     Gradient {
-      GradientStop { position: 0.000
-      color: Qt.rgba(1, 0, 0, 1) }
-      GradientStop { position: 0.167;
-      color: Qt.rgba(1, 1, 0, 1) }
-      GradientStop { position: 0.333;
-      color: Qt.rgba(0, 1, 0, 1) }
-      GradientStop { position: 0.500;
-      color: Qt.rgba(0, 1, 1, 1) }
-      GradientStop { position: 0.667;
-      color: Qt.rgba(0, 0, 1, 1) }
-      GradientStop { position: 0.833;
-      color: Qt.rgba(1, 0, 1, 1) }
-      GradientStop { position: 1.000;
-      color: Qt.rgba(1, 0, 0, 1) }
+      GradientStop {
+       position: 0.000
+       color: Qt.rgba(1, 0, 0, 1)
+      }
+      GradientStop {
+       position: 0.167
+       color: Qt.rgba(1, 1, 0, 1)
+      }
+      GradientStop {
+       position: 0.333
+       color: Qt.rgba(0, 1, 0, 1)
+      }
+      GradientStop {
+       position: 0.500
+       color: Qt.rgba(0, 1, 1, 1)
+       }
+      GradientStop {
+       position: 0.667
+       color: Qt.rgba(0, 0, 1, 1)
+      }
+      GradientStop {
+       position: 0.833
+       color: Qt.rgba(1, 0, 1, 1)
+      }
+      GradientStop {
+       position: 1.000
+       color: Qt.rgba(1, 0, 0, 1)
+      }
     }
         \endcode
             \li \b {gradient:} \code
     Gradient {
-      GradientStop { position: 0.0
-      color: "#F0F0F0"
+      GradientStop {
+        position: 0.0
+        color: "#F0F0F0"
       }
-      GradientStop { position: 0.5
-      color: "#000000"
+      GradientStop {
+        position: 0.5
+        color: "#000000"
       }
-      GradientStop { position: 1.0
-      color: "#F0F0F0"
+      GradientStop {
+        position: 1.0
+        color: "#F0F0F0"
       }
     }
         \endcode
             \li \b {gradient:}
     \code
     Gradient {
-      GradientStop { position: 0.0
+      GradientStop {
+        position: 0.0
         color: "#00000000"
       }
-      GradientStop { position: 1.0
+      GradientStop {
+        position: 1.0
         color: "#FF000000"
       }
     }