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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Fix security problem on webpage due to bad JS
  Accepting predicted text using hardware keyboard replaces unwanted part
  Doc: adding link to the Qt Quick Components for Symbian page.

1 files changed, 1 insertions, 12 deletions

diff --git a/tools/qdoc3/doc/config/scripts/functions.js b/tools/qdoc3/doc/config/scripts/functions.js
index 62bc535..af204d8 100755
--- a/tools/qdoc3/doc/config/scripts/functions.js
+++ b/tools/qdoc3/doc/config/scripts/functions.js
@@ -183,17 +183,6 @@ var blankRE=/^\s*$/;
 
 function CheckEmptyAndLoadList()
 {
-	/* Start Extracting information for feedback and adding this to the feedback form */
-	var pageUrl = window.location.href;
-	var pageVal = $('title').html();
-	$('#pageType').removeClass('red');
-	$('#feedUrl').remove();
-	$('#pageVal').remove();
-	$('.menuAlert').remove();
-	$('#feedform').append('<input id="feedUrl" name="feedUrl" value="'+pageUrl+'" style="display:none;">');
-	$('#feedform').append('<input id="pageVal" name="pageVal" value="'+pageVal+'" style="display:none;">');
-	/* End Extracting information for feedback and adding this to the feedback form */
-
 	/* extracts search query */
 	var value = document.getElementById('pageType').value; 
 	/* if the search is less than three chars long remove class names and remove elements from old search*/
@@ -255,4 +244,4 @@ function CheckEmptyAndLoadList()
               });
             }, 500); /* timer set to 500 ms */
         });
-      }); 
\ No newline at end of file
+      });