Merge remote-tracking branch 'origin/2.6'

Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68

5 files changed, 105 insertions, 648 deletions

diff --git a/doc/api/classic.css b/doc/api/classic.css
deleted file mode 100644
index f97bdbeaba..0000000000
--- a/doc/api/classic.css
+++ /dev/null
@@ -1,295 +0,0 @@
-BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV {
-  font-family: Arial, Geneva, Helvetica, sans-serif;
-}
-H1 {
-  text-align: center;
-  font-size: 160%;
-}
-H2 {
-  font-size: 120%;
-}
-H3 {
-  font-size: 100%;
-}
-
-h3.fn,span.fn
-{
-  background-color: #eee;
-  border-width: 1px;
-  border-style: solid;
-  border-color: #ddd;
-  font-weight: bold;
-  padding: 6px 0px 6px 10px;
-  margin: 42px 0px 0px 0px;
-}
-
-hr {
-  border: 0;
-  color: #a0a0a0;
-  background-color: #ccc;
-  height: 1px;
-  width: 100%;
-  text-align: left;
-  margin: 34px 0px 34px 0px;
-}
-
-table.valuelist {
-	border-width: 1px 1px 1px 1px;
-	border-style: solid;
-	border-color: #dddddd;
-	border-collapse: collapse;
-	background-color: #f0f0f0;
-}
-
-table.indextable {
-	border-width: 1px 1px 1px 1px;
-	border-collapse: collapse;
-	background-color: #f0f0f0;
-    border-color:#555;
-    font-size: 110%;
-}
-
-table td.largeindex {
-	border-width: 1px 1px 1px 1px;
-	border-collapse: collapse;
-	background-color: #f0f0f0;
-    border-color:#555;
-    font-size: 120%;
-}
-
-table.valuelist th {
-	border-width: 1px 1px 1px 2px;
-	padding: 4px;
-	border-style: solid;
-	border-color: #666;
-    color:white;
-    background-color:#666;
-}
-
-th.titleheader  {
-	border-width: 1px 0px 1px 0px;
-	padding: 4px;
-	border-style: solid;
-	border-color: #444;
-    color:white;
-    background-color:#555555;
-    font-size: 110%;
-}
-
-th.largeheader {
-	border-width: 1px 0px 1px 0px;
-	padding: 4px;
-	border-style: solid;
-	border-color: #444;
-    color:white;
-    background-color:#555555;
-    font-size: 120%;
-}
-
-p {
-
-  margin-left: 4px;
-  margin-top: 8px;
-  margin-bottom: 8px;
-}
-
-a:link
-{
-  color: #0046ad;
-  text-decoration: none
-}
-
-a:visited
-{
-  color: #672967;
-  text-decoration: none
-}
-
-a.obsolete
-{
-  color: #661100;
-  text-decoration: none
-}
-
-a.compat
-{
-  color: #661100;
-  text-decoration: none
-}
-
-a.obsolete:visited
-{
-  color: #995500;
-  text-decoration: none
-}
-
-a.compat:visited
-{
-  color: #995500;
-  text-decoration: none
-}
-
-body
-{
-  background: #ffffff;
-  color: black
-}
-
-table.generic, table.annotated
-{
-  border-width: 1px;
-  border-color:#bbb;
-  border-style:solid;  
-  border-collapse:collapse;
-}
-
-table td.memItemLeft {
-  width: 180px;
-  padding: 2px 0px 0px 8px;
-  margin: 4px;
-  border-width: 1px;
-  border-color: #E0E0E0;
-  border-style: none;
-  font-size: 100%;
-  white-space: nowrap
-}
-
-table td.memItemRight {
-  padding: 2px 8px 0px 8px;
-  margin: 4px;
-  border-width: 1px;
-  border-color: #E0E0E0;
-  border-style: none;
-  font-size: 100%;
-}
-
-table tr.odd {
-  background: #f0f0f0;
-  color: black;
-}
-
-table tr.even {
-  background: #e4e4e4;
-  color: black;
-}
-
-table.annotated th {
-  padding: 3px;
-  text-align: left
-}
-
-table.annotated td {
-  padding: 3px;
-}
-
-table tr pre
-{
-  padding-top: 0px;
-  padding-bottom: 0px;
-  padding-left: 0px;
-  padding-right: 0px;
-  border: none;
-  background: none
-}
-
-tr.qt-style
-{
-  background: #96E066;
-  color: black
-}
-
-body pre
-{
-  padding: 0.2em;
-  border: #e7e7e7 1px solid;
-  background: #f1f1f1;
-  color: black
-}
-
-table tr.qt-code pre
-{
-  padding: 0.2em;
-  border: #e7e7e7 1px solid;
-  background: #f1f1f1;
-  color: black
-}
-
-span.preprocessor, span.preprocessor a
-{
-  color: darkblue;
-}
-
-span.comment
-{
-  color: darkred;
-  font-style: italic
-}
-
-span.string,span.char
-{
-  color: darkgreen;
-}
-
-.title
-{
-    text-align: center
-}
-
-.subtitle
-{
-    font-size: 0.8em
-}
-
-.small-subtitle
-{
-    font-size: 0.65em
-}
-
-.qmlitem {
-    padding: 0;
-}
-
-.qmlname {
-    white-space: nowrap;
-    font-weight: bold;
-    font-size: 125%;
-}
-
-.qmltype {
-    font-weight: bold;
-    font-size: 125%;
-}
-
-.qmlproto, .qmldoc {
-   // border-top: 1px solid #84b0c7;
-}
-
-.qmlproto {
-    padding: 0;
-    //background-color: #e4e4e4;//#d5e1e8;
-    //font-weight: bold;
-    //-webkit-border-top-left-radius: 8px;
-    //-webkit-border-top-right-radius: 8px;
-    //-moz-border-radius-topleft: 8px;
-    //-moz-border-radius-topright: 8px;
-}
-
-.qmldoc {
-    border-top: 1px solid #e4e4e4;
-    //padding: 2px 5px;
-    //background-color: #eef3f5;
-    //border-top-width: 0;
-    //-webkit-border-bottom-left-radius: 8px;
-    //-webkit-border-bottom-right-radius: 8px;
-    //-moz-border-radius-bottomleft: 8px;
-    //-moz-border-radius-bottomright: 8px;
-}
-
-.qmldoc p, .qmldoc dl, .qmldoc ul {
-    //margin: 6px 0;
-}
-
-*.qmlitem p {
-    //margin-top: 0px;
-    //margin-bottom: 0px;
-}
diff --git a/doc/classic.css b/doc/classic.css
deleted file mode 100644
index f97bdbeaba..0000000000
--- a/doc/classic.css
+++ /dev/null
@@ -1,295 +0,0 @@
-BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV {
-  font-family: Arial, Geneva, Helvetica, sans-serif;
-}
-H1 {
-  text-align: center;
-  font-size: 160%;
-}
-H2 {
-  font-size: 120%;
-}
-H3 {
-  font-size: 100%;
-}
-
-h3.fn,span.fn
-{
-  background-color: #eee;
-  border-width: 1px;
-  border-style: solid;
-  border-color: #ddd;
-  font-weight: bold;
-  padding: 6px 0px 6px 10px;
-  margin: 42px 0px 0px 0px;
-}
-
-hr {
-  border: 0;
-  color: #a0a0a0;
-  background-color: #ccc;
-  height: 1px;
-  width: 100%;
-  text-align: left;
-  margin: 34px 0px 34px 0px;
-}
-
-table.valuelist {
-	border-width: 1px 1px 1px 1px;
-	border-style: solid;
-	border-color: #dddddd;
-	border-collapse: collapse;
-	background-color: #f0f0f0;
-}
-
-table.indextable {
-	border-width: 1px 1px 1px 1px;
-	border-collapse: collapse;
-	background-color: #f0f0f0;
-    border-color:#555;
-    font-size: 110%;
-}
-
-table td.largeindex {
-	border-width: 1px 1px 1px 1px;
-	border-collapse: collapse;
-	background-color: #f0f0f0;
-    border-color:#555;
-    font-size: 120%;
-}
-
-table.valuelist th {
-	border-width: 1px 1px 1px 2px;
-	padding: 4px;
-	border-style: solid;
-	border-color: #666;
-    color:white;
-    background-color:#666;
-}
-
-th.titleheader  {
-	border-width: 1px 0px 1px 0px;
-	padding: 4px;
-	border-style: solid;
-	border-color: #444;
-    color:white;
-    background-color:#555555;
-    font-size: 110%;
-}
-
-th.largeheader {
-	border-width: 1px 0px 1px 0px;
-	padding: 4px;
-	border-style: solid;
-	border-color: #444;
-    color:white;
-    background-color:#555555;
-    font-size: 120%;
-}
-
-p {
-
-  margin-left: 4px;
-  margin-top: 8px;
-  margin-bottom: 8px;
-}
-
-a:link
-{
-  color: #0046ad;
-  text-decoration: none
-}
-
-a:visited
-{
-  color: #672967;
-  text-decoration: none
-}
-
-a.obsolete
-{
-  color: #661100;
-  text-decoration: none
-}
-
-a.compat
-{
-  color: #661100;
-  text-decoration: none
-}
-
-a.obsolete:visited
-{
-  color: #995500;
-  text-decoration: none
-}
-
-a.compat:visited
-{
-  color: #995500;
-  text-decoration: none
-}
-
-body
-{
-  background: #ffffff;
-  color: black
-}
-
-table.generic, table.annotated
-{
-  border-width: 1px;
-  border-color:#bbb;
-  border-style:solid;  
-  border-collapse:collapse;
-}
-
-table td.memItemLeft {
-  width: 180px;
-  padding: 2px 0px 0px 8px;
-  margin: 4px;
-  border-width: 1px;
-  border-color: #E0E0E0;
-  border-style: none;
-  font-size: 100%;
-  white-space: nowrap
-}
-
-table td.memItemRight {
-  padding: 2px 8px 0px 8px;
-  margin: 4px;
-  border-width: 1px;
-  border-color: #E0E0E0;
-  border-style: none;
-  font-size: 100%;
-}
-
-table tr.odd {
-  background: #f0f0f0;
-  color: black;
-}
-
-table tr.even {
-  background: #e4e4e4;
-  color: black;
-}
-
-table.annotated th {
-  padding: 3px;
-  text-align: left
-}
-
-table.annotated td {
-  padding: 3px;
-}
-
-table tr pre
-{
-  padding-top: 0px;
-  padding-bottom: 0px;
-  padding-left: 0px;
-  padding-right: 0px;
-  border: none;
-  background: none
-}
-
-tr.qt-style
-{
-  background: #96E066;
-  color: black
-}
-
-body pre
-{
-  padding: 0.2em;
-  border: #e7e7e7 1px solid;
-  background: #f1f1f1;
-  color: black
-}
-
-table tr.qt-code pre
-{
-  padding: 0.2em;
-  border: #e7e7e7 1px solid;
-  background: #f1f1f1;
-  color: black
-}
-
-span.preprocessor, span.preprocessor a
-{
-  color: darkblue;
-}
-
-span.comment
-{
-  color: darkred;
-  font-style: italic
-}
-
-span.string,span.char
-{
-  color: darkgreen;
-}
-
-.title
-{
-    text-align: center
-}
-
-.subtitle
-{
-    font-size: 0.8em
-}
-
-.small-subtitle
-{
-    font-size: 0.65em
-}
-
-.qmlitem {
-    padding: 0;
-}
-
-.qmlname {
-    white-space: nowrap;
-    font-weight: bold;
-    font-size: 125%;
-}
-
-.qmltype {
-    font-weight: bold;
-    font-size: 125%;
-}
-
-.qmlproto, .qmldoc {
-   // border-top: 1px solid #84b0c7;
-}
-
-.qmlproto {
-    padding: 0;
-    //background-color: #e4e4e4;//#d5e1e8;
-    //font-weight: bold;
-    //-webkit-border-top-left-radius: 8px;
-    //-webkit-border-top-right-radius: 8px;
-    //-moz-border-radius-topleft: 8px;
-    //-moz-border-radius-topright: 8px;
-}
-
-.qmldoc {
-    border-top: 1px solid #e4e4e4;
-    //padding: 2px 5px;
-    //background-color: #eef3f5;
-    //border-top-width: 0;
-    //-webkit-border-bottom-left-radius: 8px;
-    //-webkit-border-bottom-right-radius: 8px;
-    //-moz-border-radius-bottomleft: 8px;
-    //-moz-border-radius-bottomright: 8px;
-}
-
-.qmldoc p, .qmldoc dl, .qmldoc ul {
-    //margin: 6px 0;
-}
-
-*.qmlitem p {
-    //margin-top: 0px;
-    //margin-bottom: 0px;
-}
diff --git a/doc/config/qt-html-default-styles.qdocconf b/doc/config/qt-html-default-styles.qdocconf
index f01dfe9a4e..63ab33121a 100644
--- a/doc/config/qt-html-default-styles.qdocconf
+++ b/doc/config/qt-html-default-styles.qdocconf
@@ -2,33 +2,54 @@
 # specified relative to the template directory and will be copied into
 # subdirectories of the output directory.
 
-HTML.templatedir = $SRCDIR/templates
+HTML.templatedir = $SRCDIR/config
 
-HTML.stylesheets = style/offline.css
+HTML.stylesheets = ../templates/style/offline.css
 
 HTML.scripts     =
 
 # Files not referenced in any qdoc file (last four needed by qtdemo)
 # See also qhp.Qt.extraFiles
-extraimages.HTML        = qt-logo.png \
-                          arrow_down.png \
-                          breadcrumb.png \
-                          bullet_gt.png \
-                          bullet_dn.png \
-                          bullet_sq.png \
-                          bullet_up.png \
-                          horBar.png \
-                          sprites-combined.png \
-                          qtcreator-screenshots.png \
-                          bgrContent.png \
-                          blu_dot.png \
-                          btn_next.png \
-                          btn_prev.png \
-                          ico_note.png \
-                          ico_note_attention.png \
-                          ico_out.png \
-                          arrow_bc.png \
-                          home.png
+# for Qt 4:
+extraimages.HTML        = ../templates/images/qt-logo.png \
+                          ../templates/images/arrow_down.png \
+                          ../templates/images/breadcrumb.png \
+                          ../templates/images/bullet_gt.png \
+                          ../templates/images/bullet_dn.png \
+                          ../templates/images/bullet_sq.png \
+                          ../templates/images/bullet_up.png \
+                          ../templates/images/horBar.png \
+                          ../templates/images/sprites-combined.png \
+                          ../templates/images/qtcreator-screenshots.png \
+                          ../templates/images/bgrContent.png \
+                          ../templates/images/blu_dot.png \
+                          ../templates/images/btn_next.png \
+                          ../templates/images/btn_prev.png \
+                          ../templates/images/ico_note.png \
+                          ../templates/images/ico_note_attention.png \
+                          ../templates/images/ico_out.png \
+                          ../templates/images/arrow_bc.png \
+                          ../templates/images/home.png
+# for Qt 5
+HTML.extraimages        = ../templates/images/qt-logo.png \
+                          ../templates/images/arrow_down.png \
+                          ../templates/images/breadcrumb.png \
+                          ../templates/images/bullet_gt.png \
+                          ../templates/images/bullet_dn.png \
+                          ../templates/images/bullet_sq.png \
+                          ../templates/images/bullet_up.png \
+                          ../templates/images/horBar.png \
+                          ../templates/images/sprites-combined.png \
+                          ../templates/images/qtcreator-screenshots.png \
+                          ../templates/images/bgrContent.png \
+                          ../templates/images/blu_dot.png \
+                          ../templates/images/btn_next.png \
+                          ../templates/images/btn_prev.png \
+                          ../templates/images/ico_note.png \
+                          ../templates/images/ico_note_attention.png \
+                          ../templates/images/ico_out.png \
+                          ../templates/images/arrow_bc.png \
+                          ../templates/images/home.png
 
 # Include the style sheets and scripts used.
 
diff --git a/doc/config/qt-html-online-styles.qdocconf b/doc/config/qt-html-online-styles.qdocconf
index ce6aec1af0..56b05dd30a 100644
--- a/doc/config/qt-html-online-styles.qdocconf
+++ b/doc/config/qt-html-online-styles.qdocconf
@@ -2,49 +2,76 @@
 # specified relative to the template directory and will be copied into
 # subdirectories of the output directory.
 
-HTML.templatedir = $SRCDIR/templates
+HTML.templatedir = $SRCDIR/config
 
-HTML.stylesheets = style/narrow.css \
-                   style/style.css \
-                   style/style_ie6.css \
-                   style/style_ie7.css \
-                   style/style_ie8.css \
-                   style/superfish.css
+HTML.stylesheets = ../templates/style/narrow.css \
+                   ../templates/style/style.css \
+                   ../templates/style/style_ie6.css \
+                   ../templates/style/style_ie7.css \
+                   ../templates/style/style_ie8.css \
+                   ../templates/style/superfish.css
 
 # Adding jquery and functions - providing online tools and search features
-HTML.scripts     = scripts/functions.js \
-                   scripts/narrow.js \
-                   scripts/superfish.js \
-                   scripts/jquery.js
+HTML.scripts     = ../templates/scripts/functions.js \
+                   ../templates/scripts/narrow.js \
+                   ../templates/scripts/superfish.js \
+                   ../templates/scripts/jquery.js
 
 
 # Files not referenced in any qdoc file.
 # See also qhp.Qt.extraFiles
-extraimages.HTML        = qt-logo.png \
-                          bg_l.png \
-                          bg_l_blank.png \
-                          bg_ll_blank.png \
-                          bg_ul_blank.png \
-                          btn_next_green.png \
-                          btn_prev_green.png \
-                          header_bg.png \
-                          bg_r.png \
-                          box_bg.png \
-                          breadcrumb.png \
-                          btn_next_green.png \
-                          btn_prev_green.png \
-                          bullet_gt.png \
-                          bullet_dn.png \
-                          bullet_sq.png \
-                          bullet_up.png \
-                          arrow_down.png \
-                          feedbackground.png \
-                          horBar.png \
-                          page.png \
-                          page_bg.png \
-                          sprites-combined.png \
-                          spinner.gif \
-                          qtcreator-screenshots.png
+# for Qt 4
+extraimages.HTML        = ../templates/images/qt-logo.png \
+                          ../templates/images/bg_l.png \
+                          ../templates/images/bg_l_blank.png \
+                          ../templates/images/bg_ll_blank.png \
+                          ../templates/images/bg_ul_blank.png \
+                          ../templates/images/btn_next_green.png \
+                          ../templates/images/btn_prev_green.png \
+                          ../templates/images/header_bg.png \
+                          ../templates/images/bg_r.png \
+                          ../templates/images/box_bg.png \
+                          ../templates/images/breadcrumb.png \
+                          ../templates/images/btn_next_green.png \
+                          ../templates/images/btn_prev_green.png \
+                          ../templates/images/bullet_gt.png \
+                          ../templates/images/bullet_dn.png \
+                          ../templates/images/bullet_sq.png \
+                          ../templates/images/bullet_up.png \
+                          ../templates/images/arrow_down.png \
+                          ../templates/images/feedbackground.png \
+                          ../templates/images/horBar.png \
+                          ../templates/images/page.png \
+                          ../templates/images/page_bg.png \
+                          ../templates/images/sprites-combined.png \
+                          ../templates/images/spinner.gif \
+                          ../templates/images/qtcreator-screenshots.png
+# for Qt 5
+HTML.extraimages        = ../templates/images/qt-logo.png \
+                          ../templates/images/bg_l.png \
+                          ../templates/images/bg_l_blank.png \
+                          ../templates/images/bg_ll_blank.png \
+                          ../templates/images/bg_ul_blank.png \
+                          ../templates/images/btn_next_green.png \
+                          ../templates/images/btn_prev_green.png \
+                          ../templates/images/header_bg.png \
+                          ../templates/images/bg_r.png \
+                          ../templates/images/box_bg.png \
+                          ../templates/images/breadcrumb.png \
+                          ../templates/images/btn_next_green.png \
+                          ../templates/images/btn_prev_green.png \
+                          ../templates/images/bullet_gt.png \
+                          ../templates/images/bullet_dn.png \
+                          ../templates/images/bullet_sq.png \
+                          ../templates/images/bullet_up.png \
+                          ../templates/images/arrow_down.png \
+                          ../templates/images/feedbackground.png \
+                          ../templates/images/horBar.png \
+                          ../templates/images/page.png \
+                          ../templates/images/page_bg.png \
+                          ../templates/images/sprites-combined.png \
+                          ../templates/images/spinner.gif \
+                          ../templates/images/qtcreator-screenshots.png
     
 # Include the style sheets and scripts used.
 
diff --git a/doc/titlecase/to-title-case.html b/doc/titlecase/to-title-case.html
index 5db2150027..8fc914572a 100755
--- a/doc/titlecase/to-title-case.html
+++ b/doc/titlecase/to-title-case.html
@@ -6,7 +6,6 @@
   <title>Qt Title Case</title>
   <script type="text/javascript" src="jquery.js"></script>
   <script type="text/javascript" src="to-title-case.js"></script>
-  <link rel="stylesheet" type="text/css" href="../classic.css" />
 
   <script type="text/javascript">
     $(document).ready(function(){