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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Removed a change from the 4.7.0 change log.
  Improve look and feel of itemviews on mac
  doc: Fixed many broken links.
  doc: Fixed many broken links.
  update 4.7.0 changes
  QPushButton's click area exceeds the button area by far on Mac OS X
  QApplication::closeAllWindows() should ignore windows being closed
  Examples: Fix compilation with namespace.
  Use QApplication::arguments() to check for command line args
  Added support for .rc files on VS2010.
  Doc: Updating CSS and JS
  Docs: added an intro for qml, Quick for Beginners.
  Fix crash on exit in native wifi plugin on Vista+ when run in debugger.

1 files changed, 17 insertions, 0 deletions

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 7d93486..afd1ec3 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -33,7 +33,21 @@ $('#bigA').click(function() {
 		$(this).addClass('active')
 });
 
+$('.feedclose').click(function() {
+	$('.bd').show();
+	$('.hd').show();
+	$('.footer').show();
+	$('#feedbackBox').hide();
+	$('#blurpage').hide();
+});
 
+$('.feedback').click(function() {
+	$('.bd').hide();
+	$('.hd').hide();
+	$('.footer').hide();
+	$('#feedbackBox').show();
+	$('#blurpage').show();
+});
 var lookupCount = 0;
 var articleCount = 0;
 var exampleCount = 0;
@@ -131,6 +145,9 @@ else
 	*/
 // Loads on doc ready
 	$(document).ready(function () {
+	var pageUrl = window.location.href;
+	//alert(pageUrl);
+	$('#pageUrl').attr('foo',pageUrl);
 	var pageTitle = $('title').html();
 		$('#feedform').append('<input id="page" name="pageVal" value="'+pageTitle+'" style="display:none;">');
           var currentString = $('#pageType').val() ;