Merge branch 'stable' into dev

Change-Id: I0ff4fb4cb9acd73db397bc44c2970a7286a2d0c2

14 files changed, 13 insertions, 13 deletions

diff --git a/basicsuite/graphicaleffects/Checkers.qml b/basicsuite/graphicaleffects/Checkers.qml
index 4dc37b1..404baef 100644
--- a/basicsuite/graphicaleffects/Checkers.qml
+++ b/basicsuite/graphicaleffects/Checkers.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_BrightnessContrast.qml b/basicsuite/graphicaleffects/effect_BrightnessContrast.qml
index c4d425b..ea391c7 100644
--- a/basicsuite/graphicaleffects/effect_BrightnessContrast.qml
+++ b/basicsuite/graphicaleffects/effect_BrightnessContrast.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_Colorize.qml b/basicsuite/graphicaleffects/effect_Colorize.qml
index a6007b2..65675ca 100644
--- a/basicsuite/graphicaleffects/effect_Colorize.qml
+++ b/basicsuite/graphicaleffects/effect_Colorize.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_CustomDissolve.qml b/basicsuite/graphicaleffects/effect_CustomDissolve.qml
index a7c4522..53bd082 100644
--- a/basicsuite/graphicaleffects/effect_CustomDissolve.qml
+++ b/basicsuite/graphicaleffects/effect_CustomDissolve.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_CustomWave.qml b/basicsuite/graphicaleffects/effect_CustomWave.qml
index eff9a45..79caaae 100644
--- a/basicsuite/graphicaleffects/effect_CustomWave.qml
+++ b/basicsuite/graphicaleffects/effect_CustomWave.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_Displacement.qml b/basicsuite/graphicaleffects/effect_Displacement.qml
index 2ca3b6a..0b20906 100644
--- a/basicsuite/graphicaleffects/effect_Displacement.qml
+++ b/basicsuite/graphicaleffects/effect_Displacement.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_DropShadow.qml b/basicsuite/graphicaleffects/effect_DropShadow.qml
index 342e531..fd3dbfc 100644
--- a/basicsuite/graphicaleffects/effect_DropShadow.qml
+++ b/basicsuite/graphicaleffects/effect_DropShadow.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_GaussianBlur.qml b/basicsuite/graphicaleffects/effect_GaussianBlur.qml
index 33e5317..8a3550c 100644
--- a/basicsuite/graphicaleffects/effect_GaussianBlur.qml
+++ b/basicsuite/graphicaleffects/effect_GaussianBlur.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_Glow.qml b/basicsuite/graphicaleffects/effect_Glow.qml
index 96d1a4b..82f64d8 100644
--- a/basicsuite/graphicaleffects/effect_Glow.qml
+++ b/basicsuite/graphicaleffects/effect_Glow.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_HueSaturation.qml b/basicsuite/graphicaleffects/effect_HueSaturation.qml
index e799ae8..58ed717 100644
--- a/basicsuite/graphicaleffects/effect_HueSaturation.qml
+++ b/basicsuite/graphicaleffects/effect_HueSaturation.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_OpacityMask.qml b/basicsuite/graphicaleffects/effect_OpacityMask.qml
index fcf4df8..6ec3cb7 100644
--- a/basicsuite/graphicaleffects/effect_OpacityMask.qml
+++ b/basicsuite/graphicaleffects/effect_OpacityMask.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_ThresholdMask.qml b/basicsuite/graphicaleffects/effect_ThresholdMask.qml
index b2b87b3..2cd2d48 100644
--- a/basicsuite/graphicaleffects/effect_ThresholdMask.qml
+++ b/basicsuite/graphicaleffects/effect_ThresholdMask.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/main.qml b/basicsuite/graphicaleffects/main.qml
index 0108180..78a5f42 100644
--- a/basicsuite/graphicaleffects/main.qml
+++ b/basicsuite/graphicaleffects/main.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/preview_l.jpg b/basicsuite/graphicaleffects/preview_l.jpg
index 80fbbd5..7f75ed5 100644
--- a/basicsuite/graphicaleffects/preview_l.jpg
+++ b/basicsuite/graphicaleffects/preview_l.jpg