Merge remote-tracking branch 'origin/4.12'

Change-Id: If8f433d1084763c1aea4a3454ae163750495c569

41 files changed, 90 insertions, 35 deletions

diff --git a/doc/qtcreator/images/creator_advanceduse.png b/doc/qtcreator/images/creator_advanceduse.png
deleted file mode 100644
index c3ec46c38e..0000000000
--- a/doc/qtcreator/images/creator_advanceduse.png
+++ /dev/null
diff --git a/doc/qtcreator/images/creator_buildingrunning.png b/doc/qtcreator/images/creator_buildingrunning.png
deleted file mode 100644
index a52c4b392f..0000000000
--- a/doc/qtcreator/images/creator_buildingrunning.png
+++ /dev/null
diff --git a/doc/qtcreator/images/creator_coding.png b/doc/qtcreator/images/creator_coding.png
deleted file mode 100644
index 9597fe831f..0000000000
--- a/doc/qtcreator/images/creator_coding.png
+++ /dev/null
diff --git a/doc/qtcreator/images/creator_designinguserinterface.png b/doc/qtcreator/images/creator_designinguserinterface.png
deleted file mode 100644
index 85162a52ce..0000000000
--- a/doc/qtcreator/images/creator_designinguserinterface.png
+++ /dev/null
diff --git a/doc/qtcreator/images/creator_gettinghelp.png b/doc/qtcreator/images/creator_gettinghelp.png
deleted file mode 100644
index c3ae18b392..0000000000
--- a/doc/qtcreator/images/creator_gettinghelp.png
+++ /dev/null
diff --git a/doc/qtcreator/images/creator_gettingstarted.png b/doc/qtcreator/images/creator_gettingstarted.png
deleted file mode 100644
index e6177959ad..0000000000
--- a/doc/qtcreator/images/creator_gettingstarted.png
+++ /dev/null
diff --git a/doc/qtcreator/images/creator_managingprojects.png b/doc/qtcreator/images/creator_managingprojects.png
deleted file mode 100644
index dfb2ebe67d..0000000000
--- a/doc/qtcreator/images/creator_managingprojects.png
+++ /dev/null
diff --git a/doc/qtcreator/images/creator_publishing.png b/doc/qtcreator/images/creator_publishing.png
deleted file mode 100644
index b7e79a9bc3..0000000000
--- a/doc/qtcreator/images/creator_publishing.png
+++ /dev/null
diff --git a/doc/qtcreator/images/creator_testing.png b/doc/qtcreator/images/creator_testing.png
deleted file mode 100644
index 395f898cdd..0000000000
--- a/doc/qtcreator/images/creator_testing.png
+++ /dev/null
diff --git a/doc/qtcreator/images/front-advanced.png b/doc/qtcreator/images/front-advanced.png
new file mode 100644
index 0000000000..67e0ef2ad9
--- /dev/null
+++ b/doc/qtcreator/images/front-advanced.png
diff --git a/doc/qtcreator/images/front-coding.png b/doc/qtcreator/images/front-coding.png
new file mode 100644
index 0000000000..da5cf5f3b6
--- /dev/null
+++ b/doc/qtcreator/images/front-coding.png
diff --git a/doc/qtcreator/images/front-gs.png b/doc/qtcreator/images/front-gs.png
new file mode 100644
index 0000000000..16c0483535
--- /dev/null
+++ b/doc/qtcreator/images/front-gs.png
diff --git a/doc/qtcreator/images/front-help.png b/doc/qtcreator/images/front-help.png
new file mode 100644
index 0000000000..9eb11f716a
--- /dev/null
+++ b/doc/qtcreator/images/front-help.png
diff --git a/doc/qtcreator/images/front-preview.png b/doc/qtcreator/images/front-preview.png
new file mode 100644
index 0000000000..fc57868e11
--- /dev/null
+++ b/doc/qtcreator/images/front-preview.png
diff --git a/doc/qtcreator/images/front-projects.png b/doc/qtcreator/images/front-projects.png
new file mode 100644
index 0000000000..8ea1a82954
--- /dev/null
+++ b/doc/qtcreator/images/front-projects.png
diff --git a/doc/qtcreator/images/front-publishing.png b/doc/qtcreator/images/front-publishing.png
new file mode 100644
index 0000000000..cd142df588
--- /dev/null
+++ b/doc/qtcreator/images/front-publishing.png
diff --git a/doc/qtcreator/images/front-testing.png b/doc/qtcreator/images/front-testing.png
new file mode 100644
index 0000000000..79f80f750a
--- /dev/null
+++ b/doc/qtcreator/images/front-testing.png
diff --git a/doc/qtcreator/images/front-ui.png b/doc/qtcreator/images/front-ui.png
new file mode 100644
index 0000000000..3613a65676
--- /dev/null
+++ b/doc/qtcreator/images/front-ui.png
diff --git a/doc/qtcreator/src/editors/creator-coding.qdoc b/doc/qtcreator/src/editors/creator-coding.qdoc
index 5250c351b6..a8b86f6b58 100644
--- a/doc/qtcreator/src/editors/creator-coding.qdoc
+++ b/doc/qtcreator/src/editors/creator-coding.qdoc
@@ -41,7 +41,7 @@
     \title Coding
 
     \if defined(qtcreator)
-    \image creator_coding.png
+    \image front-coding.png
     \endif
 
     \list
diff --git a/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc b/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc
index 362425971a..7f89c0ea81 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc
@@ -36,7 +36,7 @@
 
     \title Advanced Use
 
-    \image creator_advanceduse.png
+    \image front-advanced.png
 
     \QC attempts to meet your development needs, whether you are an
     experienced Qt developer or a newcomer to Qt. When you install \QC
diff --git a/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc
index 456df09ff7..67dbd629af 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc
@@ -36,7 +36,7 @@
 
     \title Designing User Interfaces
 
-    \image creator_designinguserinterface.png
+    \image front-ui.png
 
     \QC provides integrated visual editors for designing Qt Quick and
     widget-based applications in the Design mode. The integration
diff --git a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc
index 627bd49595..4efb8f79dd 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc
@@ -38,9 +38,9 @@
 
     \table
         \row
-            \li \inlineimage creator_gettingstarted.png
-            \li \inlineimage creator_designinguserinterface.png
-            \li \inlineimage creator_advanceduse.png
+            \li \inlineimage front-gs.png
+            \li \inlineimage front-ui.png
+            \li \inlineimage front-advanced.png
         \row
             \li \b {\l{IDE Overview}}
 
@@ -59,8 +59,8 @@
                 control systems. For an overview of the options you have, go to
                 \l{Configuring Qt Creator}.
         \row
-            \li \inlineimage creator_buildingrunning.png
-            \li \inlineimage creator_gettinghelp.png
+            \li \inlineimage front-preview.png
+            \li \inlineimage front-help.png
             \li
         \row
             \li \b {\l{Building and Running an Example}}
diff --git a/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc
index 5ce2e861b0..b808d79e53 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc
@@ -36,7 +36,7 @@
 
     \title Getting Help
 
-    \image creator_gettinghelp.png
+    \image front-help.png
 
     \list
 
diff --git a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
index 1ba098e4ee..98415f3760 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
@@ -47,9 +47,9 @@
 
     \table
         \row
-            \li \inlineimage creator_managingprojects.png
-            \li \inlineimage creator_designinguserinterface.png
-            \li \inlineimage creator_coding.png
+            \li \inlineimage front-projects.png
+            \li \inlineimage front-ui.png
+            \li \inlineimage front-coding.png
         \row
             \li \b {\l{Managing Projects}}
 
@@ -84,9 +84,9 @@
                 available that provides information about the code to IDEs.
                 For more information, see \l{Coding}.
         \row
-            \li \inlineimage creator_buildingrunning.png
-            \li \inlineimage creator_testing.png
-            \li \inlineimage creator_publishing.png
+            \li \inlineimage front-preview.png
+            \li \inlineimage front-testing.png
+            \li \inlineimage front-publishing.png
         \row
             \li \b {\l{Building and Running}}
 
diff --git a/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc b/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc
index c446fb82f7..cab7e02ee4 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc
@@ -36,7 +36,7 @@
 
     \title Testing
 
-    \image creator_testing.png
+    \image front-testing.png
 
     \list
 
diff --git a/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc b/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc
index 2e69569f68..912863c18e 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc
@@ -36,7 +36,7 @@
 
     \title Tutorials
 
-    \image creator_gettinghelp.png
+    \image front-help.png
 
     You can use \QC to create applications for several platforms by using
     several technologies. The tutorials in this manual explain how to create
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc
index d132bf4410..c98362ae17 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc
@@ -36,7 +36,7 @@
 
     \title Building and Running
 
-    \image creator_buildingrunning.png
+    \image front-preview.png
 
     \QC provides support for running and deploying Qt applications built
     for different target platforms, or using different compilers, debuggers, or
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc
index 53a3f11667..f2534ba8d8 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc
@@ -36,7 +36,7 @@
 
     \title Managing Projects
 
-    \image creator_managingprojects.png
+    \image front-projects.png
 
     One of the major advantages of \QC is that it allows a team of designers and
     developers to share a project across different development platforms with a
diff --git a/doc/qtcreator/src/qtcreator.qdoc b/doc/qtcreator/src/qtcreator.qdoc
index fe5e7f8175..71d2a2a1fe 100644
--- a/doc/qtcreator/src/qtcreator.qdoc
+++ b/doc/qtcreator/src/qtcreator.qdoc
@@ -54,10 +54,10 @@
 
     \table
         \row
-            \li \inlineimage creator_gettingstarted.png
-            \li \inlineimage creator_managingprojects.png
-            \li \inlineimage creator_designinguserinterface.png
-            \li \inlineimage creator_coding.png
+            \li \inlineimage front-gs.png
+            \li \inlineimage front-projects.png
+            \li \inlineimage front-ui.png
+            \li \inlineimage front-coding.png
         \row
             \li \b {\l{Getting Started}}
                 \list
@@ -90,10 +90,10 @@
                     \li \l{Editing State Charts}
                 \endlist
         \row
-            \li \inlineimage creator_buildingrunning.png
-            \li \inlineimage creator_testing.png
-            \li \inlineimage creator_advanceduse.png
-            \li \inlineimage creator_gettinghelp.png
+            \li \inlineimage front-preview.png
+            \li \inlineimage front-testing.png
+            \li \inlineimage front-advanced.png
+            \li \inlineimage front-help.png
         \row
             \li \b {\l{Building and Running}}
                 \list
diff --git a/doc/qtdesignstudio/images/studio-3d-scenes.png b/doc/qtdesignstudio/images/studio-3d-scenes.png
index 94dbb54778..0dc2121f73 100644
--- a/doc/qtdesignstudio/images/studio-3d-scenes.png
+++ b/doc/qtdesignstudio/images/studio-3d-scenes.png
diff --git a/doc/qtdesignstudio/images/studio-animation.png b/doc/qtdesignstudio/images/studio-animation.png
index 1bcabc0a13..1365c2df96 100644
--- a/doc/qtdesignstudio/images/studio-animation.png
+++ b/doc/qtdesignstudio/images/studio-animation.png
diff --git a/doc/qtdesignstudio/images/studio-animation.svg b/doc/qtdesignstudio/images/studio-animation.svg
new file mode 100644
index 0000000000..7e4e93b0f2
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-animation.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 450 270" overflow="visible" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#C9C7C7" d="M433.8,269.6H16.2c-7.8,0-14.2-6.4-14.2-14.2V14.2C2,6.4,8.4,0,16.2,0h417.6c7.8,0,14.2,6.4,14.2,14.2
+			v241.2C448,263.2,441.6,269.6,433.8,269.6z"/>
+		<path fill="#878686" d="M2.4,19.5L2,14.1C2,6.3,8.3,0,16.1,0h417.9c7.8,0,14.1,6.3,14.1,14.1v6.8"/>
+		<circle fill="#DD5858" cx="19.3" cy="10.6" r="5"/>
+		<circle fill="#DBC558" cx="36.1" cy="10.6" r="5"/>
+		<circle fill="#52B257" cx="52.9" cy="10.6" r="5"/>
+	</g>
+	<path fill="#FFFFFF" d="M437.1,262.2H13.4c-2.8,0-5-2.2-5-5V185c0-2.8,2.2-5,5-5h423.7c2.8,0,5,2.2,5,5v72.2
+		C442.1,260,439.9,262.2,437.1,262.2z"/>
+	<path fill="none" stroke="#FFFFFF" stroke-width="7.4167" stroke-linecap="round" stroke-miterlimit="10" d="M190.6,91.4
+		c0-24.3,19.7-44.1,44.1-44.1s44.1,19.7,44.1,44.1s-19.7,44.1-44.1,44.1"/>
+	<circle fill="#FFFFFF" cx="233.8" cy="91.1" r="19.7"/>
+	<polygon fill="#878686" points="258.9,158 256.2,193.9 267.4,180.3 284.4,183.1 	"/>
+	<path fill="#878686" d="M228.2,195.9H19.4c-2.8,0-5-2.2-5-5V188c0-2.8,2.2-5,5-5h208.8c2.8,0,5,2.2,5,5v2.9
+		C233.2,193.6,231,195.9,228.2,195.9z"/>
+	<path fill="#878686" d="M348,223.6H206.5c-2.8,0-5-2.2-5-5v-2.9c0-2.8,2.2-5,5-5H348c2.8,0,5,2.2,5,5v2.9
+		C353,221.4,350.8,223.6,348,223.6z"/>
+	<path fill="#878686" d="M419.3,247.4h-86.1c-2.8,0-5-2.2-5-5v-2.9c0-2.8,2.2-5,5-5h86.1c2.8,0,5,2.2,5,5v2.9
+		C424.3,245.1,422.1,247.4,419.3,247.4z"/>
+	
+		<rect x="222.4" y="199" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -77.0099 218.9356)" fill="#878686" width="6.8" height="6.8"/>
+	
+		<rect x="18.4" y="199" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -136.7589 74.6888)" fill="#878686" width="6.8" height="6.8"/>
+	
+		<rect x="117.4" y="199" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -107.7546 144.7115)" fill="#878686" width="6.8" height="6.8"/>
+	
+		<rect x="210.5" y="226.7" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -100.0968 218.6541)" fill="#878686" width="6.8" height="6.8"/>
+	
+		<rect x="307.5" y="226.7" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -71.6725 287.2764)" fill="#878686" width="6.8" height="6.8"/>
+	
+		<rect x="338.2" y="251.5" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -80.1869 316.2345)" fill="#878686" width="6.8" height="6.8"/>
+	
+		<rect x="410.5" y="251.5" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -59.0137 367.3511)" fill="#878686" width="6.8" height="6.8"/>
+	<g>
+		<path fill="#FFFFFF" d="M175.7,73.5v14h-2.9V76.8l-3,1.9l-1.3-2.2l4.6-3.1H175.7z"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M290.4,59.2h-9.1v-2.5l3-3c1.1-1.1,1.8-1.9,2.2-2.5s0.6-1.2,0.6-1.9c0-0.7-0.2-1.1-0.5-1.4
+			c-0.3-0.3-0.8-0.4-1.5-0.4c-0.9,0-2,0.1-3.1,0.3l-0.5,0.1l-0.1-2.3c1.4-0.4,2.8-0.6,4.3-0.6c3,0,4.4,1.3,4.4,4
+			c0,1-0.2,1.9-0.7,2.7s-1.3,1.7-2.5,2.8l-2.4,2.2h5.8V59.2z"/>
+	</g>
+	<g>
+		<path fill="#8389A8" d="M238.9,145.1c1.6-0.6,3.5-1,5.5-1c2,0,3.5,0.4,4.4,1.2s1.4,2,1.4,3.7c0,1.7-0.7,3-2.1,3.9
+			c0.9,0.5,1.5,0.9,1.8,1.4s0.5,1.3,0.5,2.4c0,1.9-0.5,3.3-1.4,4.3c-1,0.9-2.5,1.4-4.6,1.4c-1.6,0-3.2-0.2-4.9-0.7l-0.9-0.2l0.2-2.8
+			c2,0.3,3.7,0.5,5,0.5c1.8,0,2.8-0.8,2.8-2.4c0-0.7-0.2-1.2-0.7-1.6c-0.5-0.4-1.1-0.6-1.9-0.6h-3.6v-3h3.6c0.6,0,1.1-0.2,1.6-0.7
+			c0.5-0.5,0.7-1.1,0.7-1.7c0-1.3-0.9-1.9-2.6-1.9c-1.2,0-2.5,0.1-3.9,0.4l-0.7,0.1L238.9,145.1z"/>
+	</g>
+	<line fill="none" stroke="#F9D953" stroke-width="3" stroke-miterlimit="10" x1="103.5" y1="269.2" x2="103.5" y2="165.2"/>
+	<polygon fill="#F9D953" points="103.4,178.2 111.2,164.7 95.6,164.7 	"/>
+</g>
+</svg>
diff --git a/doc/qtdesignstudio/images/studio-components.png b/doc/qtdesignstudio/images/studio-components.png
deleted file mode 100644
index d72388e53b..0000000000
--- a/doc/qtdesignstudio/images/studio-components.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-connections.png b/doc/qtdesignstudio/images/studio-connections.png
deleted file mode 100644
index 787bfbdc95..0000000000
--- a/doc/qtdesignstudio/images/studio-connections.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-gs.png b/doc/qtdesignstudio/images/studio-gs.png
deleted file mode 100644
index 898826e83d..0000000000
--- a/doc/qtdesignstudio/images/studio-gs.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-help.png b/doc/qtdesignstudio/images/studio-help.png
deleted file mode 100644
index 3cee0bf635..0000000000
--- a/doc/qtdesignstudio/images/studio-help.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-preview.png b/doc/qtdesignstudio/images/studio-preview.png
deleted file mode 100644
index 4f943f3f8d..0000000000
--- a/doc/qtdesignstudio/images/studio-preview.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-projects.png b/doc/qtdesignstudio/images/studio-projects.png
deleted file mode 100644
index 623bc1f872..0000000000
--- a/doc/qtdesignstudio/images/studio-projects.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/images/studio-settings.png b/doc/qtdesignstudio/images/studio-settings.png
deleted file mode 100644
index 2ac37ea853..0000000000
--- a/doc/qtdesignstudio/images/studio-settings.png
+++ /dev/null
diff --git a/doc/qtdesignstudio/src/qtdesignstudio.qdoc b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
index 74081404dd..5425477f9e 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
@@ -36,9 +36,9 @@
 
     \table
         \row
-            \li \inlineimage studio-gs.png
-            \li \inlineimage studio-projects.png
-            \li \inlineimage studio-components.png
+            \li \inlineimage front-gs.png
+            \li \inlineimage front-projects.png
+            \li \inlineimage front-ui.png
             \li \inlineimage studio-animation.png
         \row
         \li \l{Getting Started}
@@ -72,9 +72,9 @@
             \endlist
         \row
             \li \inlineimage studio-3d-scenes.png
-            \li \inlineimage studio-preview.png
-            \li \inlineimage studio-settings.png
-            \li \inlineimage studio-help.png
+            \li \inlineimage front-preview.png
+            \li \inlineimage front-advanced.png
+            \li \inlineimage front-help.png
         \row
             \li \b {\l{Editing 3D Scenes}}
                 \list
diff --git a/src/libs/utils/variant.h b/src/libs/utils/variant.h
index 371b9312d3..baf0c27816 100644
--- a/src/libs/utils/variant.h
+++ b/src/libs/utils/variant.h
@@ -29,9 +29,7 @@
     See std(::experimental)::variant.
 */
 
-// TODO: replace by #include <(experimental/)variant> depending on compiler and C++ version
 #if __cplusplus >= 201703L
-#error Please delete variant.hpp and the #else section below, then remove this error
 #include <variant>
 
 namespace Utils {