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

Change-Id: I4c338a44c1d64c2d8e637971ab3ec6982c40a685

3 files changed, 62 insertions, 1 deletions

diff --git a/tests/auto/guiapplauncher/demos.txt b/tests/auto/guiapplauncher/demos.txt
new file mode 100644
index 0000000000..1c48b6923d
--- /dev/null
+++ b/tests/auto/guiapplauncher/demos.txt
@@ -0,0 +1,8 @@
+"quick/demos/clocks Example", "examples/quick/demos/clocks", "clocks", 0, -1
+"quick/demos/maroon Example", "examples/quick/demos/maroon", "maroon", 0, -1
+"quick/demos/calqlatr Example", "examples/quick/demos/calqlatr", "calqlatr", 0, -1
+"quick/demos/stocqt Example", "examples/quick/demos/stocqt", "stocqt", 0, -1
+"quick/demos/tweetsearch Example", "examples/quick/demos/tweetsearch", "tweetsearch", 0, -1
+"quick/demos/samegame Example", "examples/quick/demos/samegame", "samegame", 0, -1
+"quick/demos/phoyosurface Example", "examples/quick/demos/photosurface", "photosurface", 10, -1
+"quick/demos/rssnews Example", "examples/quick/demos/rssnews", "rssnews", 0, -1
diff --git a/tests/auto/guiapplauncher/examples.txt b/tests/auto/guiapplauncher/examples.txt
new file mode 100644
index 0000000000..396e93dc1b
--- /dev/null
+++ b/tests/auto/guiapplauncher/examples.txt
@@ -0,0 +1,53 @@
+"quick/keyinteraction Example", "examples/quick/keyinteraction", "keyinteraction", 0, -1
+"quick/models/stringlistmodel Example", "examples/quick/models/stringlistmodel", "stringlistmodel", 0, -1
+"quick/models/objectlistmodel Example", "examples/quick/models/objectlistmodel", "objectlistmodel", 0, -1
+"quick/models/abstractitemmodel Example", "examples/quick/models/abstractitemmodel", "abstractitemmodel", 0, -1
+"quick/righttoleft Example", "examples/quick/righttoleft", "righttoleft", 0, -1
+"quick/externaldraganddrop Example", "examples/quick/externaldraganddrop", "externaldraganddrop", 0, -1
+"quick/customitems/maskedmousearea Example", "examples/quick/customitems/maskedmousearea", "maskedmousearea", 0, -1
+"quick/imageelements Example", "examples/quick/imageelements", "imageelements", 0, -1
+"quick/threading Example", "examples/quick/threading", "threading", 0, -1
+"quick/scenegraph/openglunderqml Example", "examples/quick/scenegraph/openglunderqml", "openglunderqml", 0, -1
+"quick/scenegraph/threadedanimation Example", "examples/quick/scenegraph/threadedanimation", "threadedanimation", 0, -1
+"quick/scenegraph/twotextureproviders Example", "examples/quick/scenegraph/twotextureproviders", "twotextureproviders", 0, -1
+"quick/scenegraph/customgeometry Example", "examples/quick/scenegraph/customgeometry", "customgeometry", 0, -1
+"quick/scenegraph/sgengine Example", "examples/quick/scenegraph/sgengine", "sgengine", 10, -1
+"quick/scenegraph/simplematerial Example", "examples/quick/scenegraph/simplematerial", "simplematerial", 0, -1
+"quick/scenegraph/textureinsgnode Example", "examples/quick/scenegraph/textureinsgnode", "textureinsgnode", 0, -1
+"quick/scenegraph/textureinthread Example", "examples/quick/scenegraph/textureinthread", "textureinthread", 0, -1
+"quick/draganddrop Example", "examples/quick/draganddrop", "draganddrop", 0, -1
+"quick/animation Example", "examples/quick/animation", "animation", 0, -1
+"quick/embeddedinwidgets Example", "examples/quick/embeddedinwidgets", "embeddedinwidgets", 0, -1
+"quick/rendercontrol Example", "examples/quick/rendercontrol", "rendercontrol", 0, -1
+"quick/views Example", "examples/quick/views", "views", 0, -1
+"quick/window Example", "examples/quick/window", "window", 10, -1
+"quick/particles/system Example", "examples/quick/particles/system", "system", 0, -1
+"quick/particles/emitters Example", "examples/quick/particles/emitters", "emitters", 0, -1
+"quick/particles/customparticle Example", "examples/quick/particles/customparticle", "customparticle", 0, -1
+"quick/particles/imageparticle Example", "examples/quick/particles/imageparticle", "imageparticle", 0, -1
+"quick/particles/affectors Example", "examples/quick/particles/affectors", "affectors", 0, -1
+"quick/localstorage/localstorage Example", "examples/quick/localstorage/localstorage", "localstorage", 0, -1
+"quick/quick-accessibility Example", "examples/quick/quick-accessibility", "quick-accessibility", 0, -1
+"quick/positioners Example", "examples/quick/positioners", "positioners", 0, -1
+"quick/shadereffects Example", "examples/quick/shadereffects", "shadereffects", 0, -1
+"quick/mousearea Example", "examples/quick/mousearea", "mousearea", 0, -1
+"quick/touchinteraction Example", "examples/quick/touchinteraction", "touchinteraction", 0, -1
+"quick/canvas Example", "examples/quick/canvas", "canvas", 0, -1
+"quick/text Example", "examples/quick/text", "text", 0, -1
+"quick/quickwidgets/qquickviewcomparison Example", "examples/quick/quickwidgets/qquickviewcomparison", "qquickviewcomparison", 0, -1
+"quick/quickwidgets/quickwidget Example", "examples/quick/quickwidgets/quickwidget", "quickwidget", 0, -1
+"qml/shell Example", "examples/qml/shell", "shell", 10, -1
+"qml/referenceexamples/extended Example", "examples/qml/referenceexamples/extended", "extended", 0, -1
+"qml/referenceexamples/binding Example", "examples/qml/referenceexamples/binding", "binding", 10, -1
+"qml/referenceexamples/adding Example", "examples/qml/referenceexamples/adding", "adding", 10, -1
+"qml/referenceexamples/attached Example", "examples/qml/referenceexamples/attached", "attached", 10, -1
+"qml/referenceexamples/default Example", "examples/qml/referenceexamples/default", "default", 10, -1
+"qml/referenceexamples/signal Example", "examples/qml/referenceexamples/signal", "signal", 10, -1
+"qml/referenceexamples/coercion Example", "examples/qml/referenceexamples/coercion", "coercion", 10, -1
+"qml/referenceexamples/grouped Example", "examples/qml/referenceexamples/grouped", "grouped", 10, -1
+"qml/referenceexamples/valuesource Example", "examples/qml/referenceexamples/valuesource", "valuesource", 10, -1
+"qml/referenceexamples/properties Example", "examples/qml/referenceexamples/properties", "properties", 10, -1
+"qml/referenceexamples/methods Example", "examples/qml/referenceexamples/methods", "methods", 10, -1
+"qml/networkaccessmanagerfactory Example", "examples/qml/networkaccessmanagerfactory", "networkaccessmanagerfactory", 10, -1
+"qml/xmlhttprequest Example", "examples/qml/xmlhttprequest", "xmlhttprequest", 0, -1
+"qmltest/qmltest Example", "examples/qmltest/qmltest", "tst_qmltestexample", 10, -1
diff --git a/tests/testapplications/text/textedit.qml b/tests/testapplications/text/textedit.qml
index 54989afd47..6b2a89a713 100644
--- a/tests/testapplications/text/textedit.qml
+++ b/tests/testapplications/text/textedit.qml
@@ -136,7 +136,7 @@ Rectangle {
                     "and a language runtime. "+
                     "A collection of C++ APIs is used to integrate these high level features with classic Qt applications."});
                     textmodel.append({ "name": "Links",
-                    "value": "This is a link - <a href=\"http://qt-project.org/doc\">Qt Docs</a>"});
+                    "value": "This is a link - <a href=\"http://doc.qt.io/\">Qt Docs</a>"});
                 }
             }
             ControlView {