Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7

5 files changed, 24 insertions, 30 deletions

diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 4b52992..8d5fa89 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -17,7 +17,10 @@ qhp.Assistant.namespace           = com.trolltech.assistant.470
 qhp.Assistant.virtualFolder       = qdoc
 qhp.Assistant.indexTitle          = Qt Assistant Manual
 qhp.Assistant.extraFiles          = 									images/bg_l.png \
-                             	    images/bg_l_blank.png \
+           	    images/bg_l_blank.png \
+		     images/bg_ll_blank.png \
+			     images/bg_ul_blank.png \
+			     images/header_bg.png \
                              	    images/bg_r.png \
 									images/box_bg.png \
 									images/breadcrumb.png \
@@ -25,24 +28,27 @@ qhp.Assistant.extraFiles          = 									images/bg_l.png \
                              	    images/bullet_dn.png \
 									images/bullet_sq.png \
                              	    images/bullet_up.png \
+									images/arrow_down.png \
                              	    images/feedbackground.png \
                              	    images/horBar.png \
 									images/page.png \
 									images/page_bg.png \
 									images/sprites-combined.png \
-									images/arrow-down.png \
 									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
                              	   images/dynamiclayouts-example.png \
-									scripts/functions.js \
-									scripts/jquery.js \
-									style/OfflineStyle.css \
-									style/style_ie6.css \
-									style/style_ie7.css \
-									style/style_ie8.css \
-                             	    style/style.css
+			     scripts/functions.js \
+			     scripts/jquery.js \
+			     scripts/narrow.js \
+			     scripts/superfish.js \
+			     style/narrow.css \
+			     style/superfish.css \
+			     style/style_ie6.css \
+			     style/style_ie7.css \
+			     style/style_ie8.css \
+			     style/style.css
 
 qhp.Assistant.filterAttributes    = qt 4.7.0 tools assistant
 qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 140b81f..4ac4f47 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -24,6 +24,9 @@ qhp.Qt.indexTitle          = Qt Reference Documentation
 qhp.Qt.extraFiles          = index.html \
                              images/bg_l.png \
                              images/bg_l_blank.png \
+			     images/bg_ll_blank.png \
+			     images/bg_ul_blank.png \
+			     images/header_bg.png \
                              images/bg_r.png \
                              images/box_bg.png \
                              images/breadcrumb.png \
@@ -31,12 +34,12 @@ qhp.Qt.extraFiles          = index.html \
                              images/bullet_dn.png \
                              images/bullet_sq.png \
                              images/bullet_up.png \
+                             images/arrow_down.png \
                              images/feedbackground.png \
                              images/horBar.png \
                              images/page.png \
                              images/page_bg.png \
                              images/sprites-combined.png \
-                             images/arrow-down.png \
                              images/spinner.gif \
                              images/stylesheet-coffee-plastique.png \
                              images/taskmenuextension-example.png \
@@ -44,17 +47,10 @@ qhp.Qt.extraFiles          = index.html \
                              images/dynamiclayouts-example.png \
                              scripts/functions.js \
                              scripts/jquery.js \
-                             scripts/shBrushCpp.js \
-                             scripts/shCore.js \
-                             scripts/shLegacy.js \
                              scripts/narrow.js \
                              scripts/superfish.js \
-                             style/shCore.css \
-                             style/shThemeDefault.css \
                              style/narrow.css \
                              style/superfish.css \
-                             style/superfish_skin.css \
-                             style/OfflineStyle.css \
                              style/style_ie6.css \
                              style/style_ie7.css \
                              style/style_ie8.css \
diff --git a/tools/qdoc3/test/qt-cpp-ignore.qdocconf b/tools/qdoc3/test/qt-cpp-ignore.qdocconf
index dcf33dc..8cc4fd9 100644
--- a/tools/qdoc3/test/qt-cpp-ignore.qdocconf
+++ b/tools/qdoc3/test/qt-cpp-ignore.qdocconf
@@ -90,4 +90,5 @@ Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
                           __attribute__ \
                           K_DECLARE_PRIVATE \
                           PHONON_OBJECT \
-                          PHONON_HEIR
+                          PHONON_HEIR \
+			  Q_PRIVATE_PROPERTY
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 31c9d5a..b428a90 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -17,12 +17,11 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "    <div id=\"nav-topright\">\n" \
 			  "      <ul>\n" \
 			  "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
-			  "        <li class=\"nav-topright-dev\"><a href=\"http://qt.nokia.com/developer\">DEV</a></li>\n" \
+			  "        <li class=\"nav-topright-dev\"><a href=\"http://developer.qt.nokia.com/\">DEV</a></li>\n" \
 			  "        <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
 			  "        <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
 			  "          DOC</a></li>\n" \
 			  "        <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
-			  "        <li class=\"nav-topright-shop\"><a title=\"SHOP\" href=\"http://shop.qt.nokia.com\">SHOP</a></li>\n" \
 			  "      </ul>\n" \
 			  "    </div>\n" \
 			  "    <div id=\"shortCut\">\n" \
@@ -113,7 +112,6 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "              <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
 			  "              <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
 			  "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
 			  "            </ul> \n" \
 			  "          </div>\n" \
 			  "        </div>\n" \
@@ -160,8 +158,8 @@ HTML.footer             = "        <!-- /div -->\n" \
 			  "  <div id=\"feedbackBox\">\n" \
 			  "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
 			  "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
-			  "      <p id=\"noteHead\">Thank you for giving your feedback. <div class=\"note\">Make sure it is related the page. For more general bugs and \n" \
-			  "      requests, please use the <a href=\"http://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a></div></p>\n" \
+			  "      <p id=\"noteHead\">Thank you for giving your feedback. <div class=\"note\">Make sure it is related to this specific page. For more general bugs and \n" \
+			  "      requests, please use the <a href=\"http://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</div></p>\n" \
 			  "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></textarea></p>\n" \
 			  "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
 			  "    </form>\n" \
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index d132771..5575b7b 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -51,17 +51,10 @@ qhp.Qt.extraFiles          = index.html \
 			     images/dynamiclayouts-example.png \
 			     scripts/functions.js \
 			     scripts/jquery.js \
-			     scripts/shBrushCpp.js \
-			     scripts/shCore.js \
-			     scripts/shLegacy.js \
 			     scripts/narrow.js \
 			     scripts/superfish.js \
-			     style/shCore.css \
-			     style/shThemeDefault.css \
 			     style/narrow.css \
 			     style/superfish.css \
-			     style/superfish_skin.css \
-  				style/OfflineStyle.css \
 			     style/style_ie6.css \
 			     style/style_ie7.css \
 			     style/style_ie8.css \