Merge remote-tracking branch 'origin/4.6'

 Conflicts:
	src/plugins/coreplugin/helpmanager.cpp

Change-Id: I2feb60ec0afb2f22f75dc137a01c3fa217b299d8

13 files changed, 102 insertions, 80 deletions

diff --git a/src/plugins/qtsupport/images/icons/androidapp.png b/src/plugins/qtsupport/images/icons/androidapp.png
deleted file mode 100644
index 31b4e85059..0000000000
--- a/src/plugins/qtsupport/images/icons/androidapp.png
+++ /dev/null
diff --git a/src/plugins/qtsupport/images/icons/buildrun.png b/src/plugins/qtsupport/images/icons/buildrun.png
deleted file mode 100644
index 0df693f5d2..0000000000
--- a/src/plugins/qtsupport/images/icons/buildrun.png
+++ /dev/null
diff --git a/src/plugins/qtsupport/images/icons/ddays13.png b/src/plugins/qtsupport/images/icons/ddays13.png
deleted file mode 100644
index 978c5a9465..0000000000
--- a/src/plugins/qtsupport/images/icons/ddays13.png
+++ /dev/null
diff --git a/src/plugins/qtsupport/images/icons/ddays14.png b/src/plugins/qtsupport/images/icons/ddays14.png
deleted file mode 100644
index c7882906df..0000000000
--- a/src/plugins/qtsupport/images/icons/ddays14.png
+++ /dev/null
diff --git a/src/plugins/qtsupport/images/icons/qteventicon.png b/src/plugins/qtsupport/images/icons/qteventicon.png
new file mode 100644
index 0000000000..b3ba23cbe3
--- /dev/null
+++ b/src/plugins/qtsupport/images/icons/qteventicon.png
diff --git a/src/plugins/qtsupport/images/icons/qtquick.png b/src/plugins/qtsupport/images/icons/qtquick.png
deleted file mode 100644
index bee3130e8d..0000000000
--- a/src/plugins/qtsupport/images/icons/qtquick.png
+++ /dev/null
diff --git a/src/plugins/qtsupport/images/icons/qwidget.png b/src/plugins/qtsupport/images/icons/qwidget.png
deleted file mode 100644
index 31df758036..0000000000
--- a/src/plugins/qtsupport/images/icons/qwidget.png
+++ /dev/null
diff --git a/src/plugins/qtsupport/images/icons/tutorialicon.png b/src/plugins/qtsupport/images/icons/tutorialicon.png
index c34f23164e..955d29d92c 100644
--- a/src/plugins/qtsupport/images/icons/tutorialicon.png
+++ b/src/plugins/qtsupport/images/icons/tutorialicon.png
diff --git a/src/plugins/qtsupport/images/icons/videotutorialicon.png b/src/plugins/qtsupport/images/icons/videotutorialicon.png
index 71b5a91cf2..b3e88de859 100644
--- a/src/plugins/qtsupport/images/icons/videotutorialicon.png
+++ b/src/plugins/qtsupport/images/icons/videotutorialicon.png
diff --git a/src/plugins/qtsupport/images/icons/worldsummit15.png b/src/plugins/qtsupport/images/icons/worldsummit15.png
deleted file mode 100644
index 728389cad1..0000000000
--- a/src/plugins/qtsupport/images/icons/worldsummit15.png
+++ /dev/null
diff --git a/src/plugins/qtsupport/images/icons/worldsummit16.png b/src/plugins/qtsupport/images/icons/worldsummit16.png
deleted file mode 100644
index e7883c847c..0000000000
--- a/src/plugins/qtsupport/images/icons/worldsummit16.png
+++ /dev/null
diff --git a/src/plugins/qtsupport/qtcreator_tutorials.xml b/src/plugins/qtsupport/qtcreator_tutorials.xml
index d018570278..264813a594 100644
--- a/src/plugins/qtsupport/qtcreator_tutorials.xml
+++ b/src/plugins/qtsupport/qtcreator_tutorials.xml
@@ -1,140 +1,169 @@
 <?xml version="1.0" encoding="utf-8"?>
 <instructionals module="Qt">
   <tutorials>
-    <tutorial imageUrl=":qtsupport/images/icons/buildrun.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/creator-build-example-application.html" projectPath="" name="Building and Running an Example Application">
+    <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/creator-build-example-application.html" projectPath="" name="Help: Build and Run Examples">
       <description><![CDATA[Testing that your installation is successful by opening an existing example application project.]]></description>
-      <tags>qt creator,build,compile</tags>
+      <tags>qt creator,build,compile,help</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/qwidget.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/creator-writing-program.html" projectPath="" name="Creating a Qt Widget Based Application">
+    <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/creator-writing-program.html" projectPath="" name="Help: Create Qt Widget-Based Applications">
       <description><![CDATA[Using Qt Creator to create a small Qt application, Text Finder.]]></description>
-      <tags>qt creator,qt designer,widgets,c++,text</tags>
+      <tags>qt creator,qt designer,widgets,c++,text,help</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtdoc/qtdoc/gettingstartedqt.html" projectPath="" name="Getting Started Programming with Qt Widgets">
+    <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtdoc/qtdoc/gettingstartedqt.html" projectPath="" name="Help: Program with Qt Widgets">
       <description><![CDATA[Developing Qt applications using C++ and the Qt Widgets module.]]></description>
-      <tags>qt,qt creator,qt designer,widgets,c++</tags>
+      <tags>qt,qt creator,qt designer,widgets,c++,help</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/qtquick.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/qtcreator-transitions-example.html" projectPath="" name="Creating a Qt Quick Application">
+    <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/qtcreator-transitions-example.html" projectPath="" name="Help: Create Qt Quick Applications">
       <description><![CDATA[Using basic QML elements and learning about basic concepts of Qt Quick.]]></description>
-      <tags>qt creator,qt quick designer,qt quick,qml,states,transitions</tags>
+      <tags>qt creator,qt quick designer,qt quick,qml,states,transitions,help</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/androidapp.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/qtcreator-accelbubble-example.html" projectPath="" name="Creating a Mobile Application">
+    <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/qtcreator-accelbubble-example.html" projectPath="" name="Help: Create Mobile Qt Applications">
       <description><![CDATA[Developing Qt Quick applications for Android and iOS devices using Qt Quick Controls.]]></description>
-      <tags>qt creator,qt quick designer,qml,android,ios,controls</tags>
+      <tags>qt creator,qt quick designer,qml,android,ios,controls,help</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtdoc/qtdoc/gettingstartedqml.html" projectPath="" name="Getting Started Programming with Qt Quick">
+    <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtdoc/qtdoc/gettingstartedqml.html" projectPath="" name="Help: Program with Qt Quick">
       <description><![CDATA[Developing Qt Quick applications using QML and C++.]]></description>
-      <tags>qt quick,qml,c++</tags>
+      <tags>qt quick,qml,c++,help</tags>
     </tutorial>
 
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Digital Instrument Cluster with Qt Quick Designer and Qt Safe Renderer" isVideo="true" videoUrl="https://www.youtube.com/watch?v=9RxxsOCeZHk" videoLength="4:06">
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Digital Instrument Cluster and Qt Safe Renderer" isVideo="true" videoUrl="https://www.youtube.com/watch?v=9RxxsOCeZHk" videoLength="4:06">
       <description><![CDATA[Creating a digital instrument cluster with Qt Quick Designer and Qt Safe Renderer.]]></description>
-      <tags>qt creator,qt quick,automotive,safe renderer,controls</tags>
+      <tags>qt creator,qt quick,automotive,safe renderer,controls,video</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Qt for Device Creation" isVideo="true" videoUrl="https://www.youtube.com/watch?v=PercN_GtVJA" videoLength="3:01">
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt for Device Creation - Overview" isVideo="true" videoUrl="https://www.youtube.com/watch?v=PercN_GtVJA" videoLength="3:01">
       <description><![CDATA[Creating a Qt widget based application.]]></description>
-      <tags>qt creator,embedded,device creation</tags>
+      <tags>qt creator,embedded,device creation,video</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Getting Started with Qt for Device Creation" isVideo="true" videoUrl="https://www.youtube.com/watch?v=QFWPw4UWL9E" videoLength="8:30">
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt for Device Creation - Getting Started" isVideo="true" videoUrl="https://www.youtube.com/watch?v=QFWPw4UWL9E" videoLength="8:30">
       <description><![CDATA[Using Qt Creator to deploy applications to an embedded device.]]></description>
-      <tags>qt creator,embedded,device creation</tags>
+      <tags>qt creator,embedded,device creation,video</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Qt Quick Designer - The Coffee Machine" isVideo="true" videoUrl="https://www.youtube.com/watch?v=Ko3YPM_tStM" videoLength="3:06">
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Quick Designer - The Coffee Machine" isVideo="true" videoUrl="https://www.youtube.com/watch?v=Ko3YPM_tStM" videoLength="3:06">
       <description><![CDATA[Creating a UI for embedded devices.]]></description>
-      <tags>qt creator,qt quick,embedded</tags>
+      <tags>qt creator,qt quick,embedded,video,controls</tags>
     </tutorial>
-
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Getting started with Qt: Hello Widget World " isVideo="true" videoUrl="https://www.youtube.com/watch?v=TIUTO8GjSGo" videoLength="9:10">
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Getting Started - Hello Widget World " isVideo="true" videoUrl="https://www.youtube.com/watch?v=TIUTO8GjSGo" videoLength="9:10">
       <description><![CDATA[Creating a Qt widget based application.]]></description>
-    <tags>qt creator,widgets</tags>
+    <tags>qt creator,widgets,video</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Getting started with Qt: Hello Quick World" isVideo="true" videoUrl="https://www.youtube.com/watch?v=nepoVgVvWEI" videoLength="13:28">
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Getting Started - Hello Quick World" isVideo="true" videoUrl="https://www.youtube.com/watch?v=nepoVgVvWEI" videoLength="13:28">
       <description><![CDATA[Creating a Qt Quick application.]]></description>
-      <tags>qt creator,qt quick</tags>
+      <tags>qt creator,qt quick,video</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Qt SCXML and State Machine Tooling in Qt Creator" isVideo="true" videoUrl="https://youtu.be/9xqhq9nDiOg" videoLength="4:53">
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt SCXML and Tooling in Qt Creator" isVideo="true" videoUrl="https://youtu.be/9xqhq9nDiOg" videoLength="4:53">
       <description><![CDATA[Creating state machines.]]></description>
-      <tags>qt creator,SCXML</tags>
+      <tags>qt creator,SCXML,video</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/worldsummit15.png" difficulty="" projectPath="" name="Introduction to Qt Creator" isVideo="true" videoUrl="https://www.youtube.com/watch?v=nGFmjOiT22Y" videoLength="50:36">
-      <description><![CDATA[Getting started with using Qt Creator for cross-platform development.]]></description>
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Using C++ Models in QML" isVideo="true" videoUrl="https://www.youtube.com/watch?v=9BcAYDlpuT8" videoLength="49:48">
+      <description><![CDATA[Creating and using a C++ model in QML.]]></description>
+      <tags>qt creator,qt quick,c++,video</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Creator - Overview" isVideo="true" videoUrl="https://youtu.be/zAqSiIGdj8M" videoLength="2:06">
+      <description><![CDATA[Overview of Qt Creator.]]></description>
       <tags>qt creator</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/worldsummit15.png" difficulty="" projectPath="" name="Custom Qt Creator Wizards" isVideo="true" videoUrl="https://www.youtube.com/watch?v=Ko3DuCgFamo" videoLength="27:21">
+
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Creator - Getting Started" isVideo="true" videoUrl="https://www.youtube.com/watch?v=nGFmjOiT22Y" videoLength="50:36">
+      <description><![CDATA[Getting started with using Qt Creator for cross-platform development.]]></description>
+      <tags>qt creator,talk,2015</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Creator - Custom Wizards" isVideo="true" videoUrl="https://www.youtube.com/watch?v=Ko3DuCgFamo" videoLength="27:21">
       <description><![CDATA[Adding custom file and project creation wizards to Qt Creator.]]></description>
-      <tags>qt creator,wizard</tags>
+      <tags>qt creator,wizard,talk,2015</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/ddays13.png" difficulty="" projectPath="" name="Extending Qt Creator Without Writing Code" isVideo="true" videoUrl="http://www.youtube.com/watch?v=DP0lMoLVneY" videoLength="59:49">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Creator - Extending Without Writing Code" isVideo="true" videoUrl="http://www.youtube.com/watch?v=DP0lMoLVneY" videoLength="59:49">
       <description><![CDATA[Customizing Qt Creator to fit your own or your customers' purposes.]]></description>
-      <tags>qt creator,configuration</tags>
+      <tags>qt creator,configuration,talk,2013</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/ddays13.png" difficulty="" projectPath="" name="Qt Creator Plugin Development" isVideo="true" videoUrl="http://www.youtube.com/watch?v=6AEYgVPjl-s" videoLength="59:49">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Creator - Plugin Development" isVideo="true" videoUrl="http://www.youtube.com/watch?v=6AEYgVPjl-s" videoLength="59:49">
       <description><![CDATA[Adding plugins to Qt Creator.]]></description>
-      <tags>qt creator,plugins</tags>
+      <tags>qt creator,plugins,talk,2013</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/ddays14.png" difficulty="" projectPath="" name="Using the QML Profiler" isVideo="true" videoUrl="https://www.youtube.com/watch?v=TiJiF0MOOFc" videoLength="55:12">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Creator - QML Profiler" isVideo="true" videoUrl="https://www.youtube.com/watch?v=TiJiF0MOOFc" videoLength="55:12">
       <description><![CDATA[Monitoring the performance of a Qt Quick application.]]></description>
-    <tags>qt quick,qt creator,qml profiler</tags>
+    <tags>qt quick,qt creator,qml profiler,talk,2014</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/worldsummit15.png" difficulty="" projectPath="" name="CPU Usage Analyzer for Device Creation" isVideo="true" videoUrl="https://www.youtube.com/watch?v=G0AbgVHGdXI" videoLength="22:30">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Creator - CPU Usage Analyzer" isVideo="true" videoUrl="https://www.youtube.com/watch?v=G0AbgVHGdXI" videoLength="22:30">
       <description><![CDATA[Using the Linux perf tool to generate data for code analysis.]]></description>
-      <tags>qt creator,cpu usage analyzer,perf,embedded,device creation</tags>
+      <tags>qt creator,cpu usage analyzer,perf,embedded,device creation,talk,2015</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/worldsummit16.png" difficulty="" projectPath="" name="Qt SCXML: State Machines Made Easier" isVideo="true" videoUrl="https://youtu.be/X0kEkB0ewyw" videoLength="42:22">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Creator - SCXML Editor" isVideo="true" videoUrl="https://youtu.be/X0kEkB0ewyw" videoLength="42:22">
       <description><![CDATA[Using the Qt SCXML module and Qt Creator SCXML editor.]]></description>
-      <tags>qt creator,SCXML</tags>
+      <tags>qt creator,scxml,talk,2016</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/worldsummit15.png" difficulty="" projectPath="" name="Effective Multi-Platform Development with Qt Creator, Qbs, and QEMU" isVideo="true" videoUrl="https://www.youtube.com/watch?v=v4glCQt2jE0" videoLength="19:08">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Creator - Multi-Platform Development" isVideo="true" videoUrl="https://www.youtube.com/watch?v=v4glCQt2jE0" videoLength="19:08">
       <description><![CDATA[Using Qt Creator, Qbs, and QEMU for application development.]]></description>
-      <tags>qt creator,qbs,qemu</tags>
+      <tags>qt creator,qbs,qemu,talk,2015</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/worldsummit16.png" difficulty="" projectPath="" name="All about Qt on Android" isVideo="true" videoUrl="https://youtu.be/dmKNxyi_YNk" videoLength="31:20">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt on Android - Overview" isVideo="true" videoUrl="https://youtu.be/dmKNxyi_YNk" videoLength="31:20">
       <description><![CDATA[Developing Qt applications for Android devices.]]></description>
-      <tags>qt creator,android</tags>
-    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Meet Qt Creator" isVideo="true" videoUrl="https://youtu.be/zAqSiIGdj8M" videoLength="2:06">
-      <description><![CDATA[Overview of Qt Creator.]]></description>
-      <tags>qt creator</tags>
+      <tags>qt creator,android,talk,2016</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/worldsummit16.png" difficulty="" projectPath="" name="Qt on iOS A to Z" isVideo="true" videoUrl="https://youtu.be/T_13aX5NTPk" videoLength="1:00:13">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt on iOS - Overview" isVideo="true" videoUrl="https://youtu.be/T_13aX5NTPk" videoLength="1:00:13">
       <description><![CDATA[Developing Qt applications for iOS.]]></description>
-      <tags>qt creator,ios</tags>
+      <tags>qt creator,ios,talk,2016</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/ddays13.png" difficulty="" projectPath="" name="Qt Creator for Bare Metal Development" isVideo="true" videoUrl="http://www.youtube.com/watch?v=hrKz63Q_Rf0" videoLength="9:35">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Creator - Bare Metal Development" isVideo="true" videoUrl="http://www.youtube.com/watch?v=hrKz63Q_Rf0" videoLength="9:35">
       <description><![CDATA[Developing Qt Applications for Bare Metal devices.]]></description>
-      <tags>qt creator,baremetal</tags>
+      <tags>qt creator,baremetal,talk,2013</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/worldsummit16.png" difficulty="" projectPath="" name="Integrating Universal Windows Platform to Qt" isVideo="true" videoUrl="https://youtu.be/tpNdw2Cs4KY" videoLength="47:38">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt on Universal Windows Platform" isVideo="true" videoUrl="https://youtu.be/tpNdw2Cs4KY" videoLength="47:38">
     <description><![CDATA[Qt support for Universal Windows Platform on desktop, mobile, and embedded devices.]]></description>
-    <tags>windows</tags>
+    <tags>uwp,talk,2016</tags>
     </tutorial>
 
-    <tutorial imageUrl=":qtsupport/images/icons/worldsummit16.png" difficulty="" projectPath="" name="Developing UIs with Qt Quick Controls 2" isVideo="true" videoUrl="https://youtu.be/ozpSl7WbVt4" videoLength="23:13">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Quick Controls 2 - Overview" isVideo="true" videoUrl="https://youtu.be/ozpSl7WbVt4" videoLength="23:13">
       <description><![CDATA[Using Qt Quick Controls 2 to create UIs.]]></description>
-      <tags>qt quick designer,controls</tags>
+      <tags>ui,qt quick designer,controls,ui,talk,2016</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/worldsummit16.png" difficulty="" projectPath="" name="Overview of GUI technologies in Qt" isVideo="true" videoUrl="https://youtu.be/WIRRoPxIerc" videoLength="40:45">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: GUI technologies in Qt" isVideo="true" videoUrl="https://youtu.be/WIRRoPxIerc" videoLength="40:45">
       <description><![CDATA[Overview of UI technologies that can be used with Qt.]]></description>
-      <tags>qt quick,ui,widgets</tags>
+      <tags>qt quick,ui,widgets,talk,2016</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/worldsummit16.png" difficulty="" projectPath="" name="Qt on Your Wrist – Qt on Android Wear" isVideo="true" videoUrl="https://youtu.be/Rd187QxihRo" videoLength="8:08">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt on Android Wear" isVideo="true" videoUrl="https://youtu.be/Rd187QxihRo" videoLength="8:08">
       <description><![CDATA[Running Qt apps on Android Wear devices.]]></description>
-      <tags>qt creator,android</tags>
+      <tags>qt creator,android,talk,2016</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/worldsummit16.png" difficulty="" projectPath="" name="Qt on macOS Updates" isVideo="true" videoUrl="https://youtu.be/qfyxXxeC73Y" videoLength="25:51">
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt on macOS - Updates" isVideo="true" videoUrl="https://youtu.be/qfyxXxeC73Y" videoLength="25:51">
       <description><![CDATA[Using Qt with macOS native windows.]]></description>
-      <tags>macos</tags>
+      <tags>macos,talk,2016</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/worldsummit15.png" difficulty="" projectPath="" name="Qt's Web Offering - An Overview" isVideo="true" videoUrl="https://www.youtube.com/watch?v=XW-oTBCj1JQ" videoLength="23:32">
-      <description><![CDATA[Overview of the Qt modules that provide functions for embedding web content into applications.]]></description>
-      <tags>qt webengine</tags>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Multi-Platform and Screen Resolution" isVideo="true" videoUrl="https://youtu.be/qclquZ99ZVQ" videoLength="27:44">
+      <description><![CDATA[Best practices for an efficient app lifecycle.]]></description>
+      <tags>qt,qt quick,screen resolution,ui,talk,2016</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/worldsummit16.png" difficulty="" projectPath="" name="New Possibilities with Qt WebEngine" isVideo="true" videoUrl="https://youtu.be/E7CIIHT_jCk" videoLength="22:29">
-      <description><![CDATA[Using the Qt WebEngine module.]]></description>
-      <tags>qt webengine</tags>
+
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Mobile Applications - Tips and Examples" isVideo="true" videoUrl="https://www.youtube.com/watch?v=OqqarK73I9E" videoLength="53:57">
+      <description><![CDATA[Technical tips and examples for developing and testing mobile apps.]]></description>
+      <tags>android,ios,talk,2017</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/worldsummit16.png" difficulty="" projectPath="" name="Developing for Multiple Screen Resolutions and Platforms" isVideo="true" videoUrl="https://youtu.be/qclquZ99ZVQ" videoLength="27:44">
-      <description><![CDATA[Best practices for an efficient app lifecycle.]]></description>
-      <tags>qt,qt quick,screen resolution</tags>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt in Medical Devices - Overview" isVideo="true" videoUrl="https://www.youtube.com/watch?v=Xe5xebP9w94" videoLength="24:53">
+      <description><![CDATA[Developing UX and UI for medical devices.]]></description>
+      <tags>medical,ui,talk,2017</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Mobile Applications - Reducing Size" isVideo="true" videoUrl="https://www.youtube.com/watch?v=3o2Wo4YzlII" videoLength="23:41">
+      <description><![CDATA[Making Android and iOS apps smaller.]]></description>
+      <tags>android,ios,talk,2017</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Automotive Suite - Overview" isVideo="true" videoUrl="https://www.youtube.com/watch?v=7FqG2lpJ1KE" videoLength="23:38">
+      <description><![CDATA[Introducing Qt Application Manager plugin in Qt Creator.]]></description>
+      <tags>automotive,application manager,talk,2017</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Embedded Devices - Virtual Keyboards" isVideo="true" videoUrl="https://www.youtube.com/watch?v=g0X2IZ9ZCTA" videoLength="19:32">
+      <description><![CDATA[Support text input via virtual keyboards on embedded devices.]]></description>
+      <tags>embedded,virtual keyboard,talk,2017</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Quick Controls 2 - Mobile Business Applications" isVideo="true" videoUrl="https://www.youtube.com/watch?v=au3brB7lNms" videoLength="23:33">
+      <description><![CDATA[Creating mobile business apps using Qt Quick Controls 2.]]></description>
+      <tags>android,ios,qt quick,controls,talk,2017</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Automotive Suite - Qt IVI" isVideo="true" videoUrl="https://www.youtube.com/watch?v=CVhVAK10TDw" videoLength="46:41">
+      <description><![CDATA[Integrating and testing vehicle functions with Qt Automotive Suite.]]></description>
+      <tags>automotive,ivi,talk,2017</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt 3D - Simple and Skeletal Animations" isVideo="true" videoUrl="https://www.youtube.com/watch?v=Cj5enhBlL28" videoLength="">
+      <description><![CDATA[Using the new animation subsystem of Qt 3D.]]></description>
+      <tags>talk,2017</tags>
     </tutorial>
     </tutorials>
 </instructionals>
diff --git a/src/plugins/qtsupport/qtsupport.qrc b/src/plugins/qtsupport/qtsupport.qrc
index 50d90e55d8..03d8dbc7e8 100644
--- a/src/plugins/qtsupport/qtsupport.qrc
+++ b/src/plugins/qtsupport/qtsupport.qrc
@@ -6,15 +6,8 @@
         <file>images/dark_qt_qrc.png</file>
         <file>images_areaofinterest.xml</file>
         <file>qtcreator_tutorials.xml</file>
-        <file>images/icons/androidapp.png</file>
-        <file>images/icons/buildrun.png</file>
-        <file>images/icons/ddays13.png</file>
-        <file>images/icons/ddays14.png</file>
-        <file>images/icons/qtquick.png</file>
-        <file>images/icons/qwidget.png</file>
         <file>images/icons/tutorialicon.png</file>
-        <file>images/icons/worldsummit15.png</file>
-        <file>images/icons/worldsummit16.png</file>
         <file>images/icons/videotutorialicon.png</file>
+        <file>images/icons/qteventicon.png</file>
     </qresource>
 </RCC>