Merge remote-tracking branch 'origin/4.12'

Change-Id: If8f433d1084763c1aea4a3454ae163750495c569

29 files changed, 27 insertions, 27 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