Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts: src/network/access/qftp.cpp src/widgets/itemviews/qheaderview.cpp src/widgets/itemviews/qlistview.cpp tests/auto/network/access/qftp/tst_qftp.cpp Change-Id: I9f928f25d45d8944dd60bb583f649fc1615bc5d9
author: Liang Qi <liang.qi@theqtcompany.com> 2016-04-07 10:47:20 +0200
committer: Liang Qi <liang.qi@theqtcompany.com> 2016-04-07 10:47:20 +0200
commit: ee0951d69b38f766e67262487be95b88501aa4a5 (patch)
tree: 116c334060500be340d4d61c99026316b0df3ce9 /examples/xml
parent: 0bb645b1ccc5a9d57b21cf0b2c4306b8e48c611c (diff)
parent: d37239aa419ee4adff4b0a8d5c1403cadff72319 (diff)
2 files changed, 0 insertions, 216 deletions
diff --git a/examples/xml/htmlinfo/nokia_com.html b/examples/xml/htmlinfo/nokia_com.html
deleted file mode 100644
index 46d4c95ee6..0000000000
--- a/examples/xml/htmlinfo/nokia_com.html
+++ /dev/null
@@ -1,215 +0,0 @@
-
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
-<head>
-
-
-    <!--startindex-->
-    <title>Nokia - Nokia on the Web</title>
-    
-        
-    <meta name="description" content="Nokia is the world's leading mobile phone supplier and a leading supplier of mobile and fixed telecom networks including related customer services."/>
-    <meta name="keywords" content="Nokia,mobile phones,cellular,telecommunications,wireless networks,datacom,GSM,multimedia terminals,handsets,customer services,press releases,financial information,student exchange,open positions,employment opportunities,career opportunities"/>
-    <meta name="modified" content=""/>
-    <meta name="category" content="Landing Page Global Flash"/>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta name="siteid" content="101"/>
-    
-    <!--stopindex-->
-    <link href="/css/style_46.css" rel="stylesheet" type="text/css">
-    
-    <link href="/NOKIA_COM_1/Home/Landing_page_2007/wayfinder.css" rel="stylesheet" type="text/css"/>
-    
-<script type="text/javascript">
-	var useHbx = true;
-</script>
-
-
-<!--WEBSIDESTORY CODE HBX1.0 (Universal)-->
-<!--COPYRIGHT 1997-2005 WEBSIDESTORY,INC. ALL RIGHTS RESERVED. U.S.PATENT No. 6,393,479B1. MORE INFO:http://websidestory.com/privacy-->
-<script language="javascript">
-var _hbEC=0,_hbE=new Array;function _hbEvent(a,b){b=_hbE[_hbEC++]=new Object();b._N=a;b._C=0;return b;}
-var hbx=_hbEvent("pv");hbx.vpc="HBX0100u";hbx.gn="ehg-nokiafin.hitbox.com";
-
-//BEGIN EDITABLE SECTION
-//CONFIGURATION VARIABLES
-hbx.acct="DM550514HPNZ";//ACCOUNT NUMBER(S)
-hbx.pn="Home";//PAGE NAME(S)
-hbx.mlc="/Home";//MULTI-LEVEL CONTENT CATEGORY
-hbx.pndef="title";//DEFAULT PAGE NAME
-hbx.ctdef="full";//DEFAULT CONTENT CATEGORY
-
-//OPTIONAL PAGE VARIABLES
-//ACTION SETTINGS
-hbx.fv="";//FORM VALIDATION MINIMUM ELEMENTS OR SUBMIT FUNCTION NAME
-hbx.lt="none";//LINK TRACKING
-hbx.dlf="n";//DOWNLOAD FILTER
-hbx.dft="n";//DOWNLOAD FILE NAMING
-hbx.elf="n";//EXIT LINK FILTER
-
-//SEGMENTS AND FUNNELS
-hbx.seg="";//VISITOR SEGMENTATION
-hbx.fnl="";//FUNNELS
-
-//CAMPAIGNS
-hbx.cmp="";//CAMPAIGN ID
-hbx.cmpn="";//CAMPAIGN ID IN QUERY
-hbx.dcmp="";//DYNAMIC CAMPAIGN ID
-hbx.dcmpn="";//DYNAMIC CAMPAIGN ID IN QUERY
-hbx.dcmpe="";//DYNAMIC CAMPAIGN EXPIRATION
-hbx.dcmpre="";//DYNAMIC CAMPAIGN RESPONSE EXPIRATION
-hbx.hra="";//RESPONSE ATTRIBUTE
-hbx.hqsr="";//RESPONSE ATTRIBUTE IN REFERRAL QUERY
-hbx.hqsp="";//RESPONSE ATTRIBUTE IN QUERY
-hbx.hlt="";//LEAD TRACKING
-hbx.hla="";//LEAD ATTRIBUTE
-hbx.gp="";//CAMPAIGN GOAL
-hbx.gpn="";//CAMPAIGN GOAL IN QUERY
-hbx.hcn="";//CONVERSION ATTRIBUTE
-hbx.hcv="";//CONVERSION VALUE
-hbx.cp="null";//LEGACY CAMPAIGN
-hbx.cpd="";//CAMPAIGN DOMAIN
-
-//CUSTOM VARIABLES
-hbx.ci="";//CUSTOMER ID
-hbx.hc1="";//CUSTOM 1
-hbx.hc2="";//CUSTOM 2
-hbx.hc3="";//CUSTOM 3
-hbx.hc4="";//CUSTOM 4
-hbx.hrf="";//CUSTOM REFERRER
-hbx.pec="";//ERROR CODES
-
-
-var cookieName = 'MyNokia';
-var nameEQ = cookieName + "=";
-var ca = document.cookie.split(';');
-for(var i=0;i < ca.length;i++) {
-    var c = ca[i];
-    while (c.charAt(0)==' ') c = c.substring(1,c.length);
-    if (c.indexOf(nameEQ) == 0) {
-        hbx.ci = c.substring(nameEQ.length,c.length);
-    }
-}
-
-//INSERT CUSTOM EVENTS
-hbx.acct="DM550514HPNZ";
-hbx.mlc="/Home";
-hbx.pn="Home";
-hbx.lt="auto";
-
-
-//END EDITABLE SECTION
-
-//REQUIRED SECTION. CHANGE "YOURSERVER" TO VALID LOCATION ON YOUR WEB SERVER (HTTPS IF FROM SECURE SERVER)
-</script><script language="javascript1.1" defer src="/Hitbox/hbx_5.js"></script>
-<script language="javascript">if(navigator.appName!='Netscape'&&parseInt(navigator.appVersion)==4)document.write("<\!"+"--")</script><noscript>
-<img src="http://ehg-nokiafin.hitbox.com/HG?hc=we88&cd=1&hv=6&ce=u&hb=DM550514HPNZ&n=Home&vcon=/Home&seg=&cmp=&gp=&fnl=&pec=&dcmp=&ra=&gn=&cv=&ld=&la=&c1=&c2=&c3=&c4=&vpc=090101rn" border="0" width="1" height="1">
-</noscript><!--//-->
-
-<!--END WEBSIDESTORY CODE-->
-        
-        
-
-
-
-</head>
-<body  lang='en'
-    style="margin: 0 0 0 0;" bgcolor="#FFFFFF" link="#0033cc" text="#000000" alink="#0033cc" vlink="#800080">
-    <div class="pagecontainer">
-
-
-<!-- start page template [Generated JSP Servlet: class=jsp_servlet._templates._page.__template6layout] -->
-
-
-
-
-
-
-
-
-
-    
-    <!--startindex-->
-    
-
-
-<!-- Begin template '/templates/content/plain.jsp' -->
-
-<div id="wayfinderContainer">
-	<div id="branding">
-                                 <img src="/NOKIA_COM_1/Home/Landing_page_2007/noflash_img/nokia_connecting_people.png" alt="Nokia - Connecting people" />  
-                               
-                </div>
-
-	<div id="flashcontent">
-	
-	<!-- main page noflash content -->
-	<div id="mainContentGlobal">
-		<div id="mainHdr"><h1>Welcome to Nokia</h1></div>
-		<div id="selectContainer">
-			<h2>Where would you like to go?</h2>
-			<div id="selectLinks">
-				<ul class="mainpage">
-					<li><a href="/A4176248">Africa</a></li>
-					<li><a href="/A4138125">Asia Pacific</a></li>
-					<li><a href="/A4138121">Europe</a></li>
-					<li><a href="/A4138127">Latin America</a></li>
-					<li><a href="/A4176245">Middle East</a></li>
-					<li><a href="/A4138126">North America</a></li>
-				</ul>
-			</div>
-		</div>
-                              <!--  <a id="banner" href="http://www.nokia.com/seasonsgreetings/">Seasons Greetings</a> -->
-	</div>
-	<div id="navi">
-		<ul>
-			<li><a href="http://www.nokiaforbusiness.com/">Nokia for Business</a></li>
-			<li><a href="http://www.nokia.com/aboutnokia">About Nokia</a></li>
-			<li><a href="http://www.nokia.com/developers">Developers</a></li>
-			<li><a href="http://www.nokia.com/press">Press</a></li>
-			<li class="lastitem"><a href="http://www.nokia.com/investors">Investors</a></li>
-			<!-- <li class="lastitem"><a href="http://www.nokia.com/environment">Environment</a></li> -->
-		</ul>
-	</div>
-	<!-- noflash content ends -->
-	
-	</div>
-	
-	<div id="footer">
-		<ul>
-			<li><a href="http://www.nokia.com/siteterms">Site Terms</a></li>
-			<li class="lastitem"><a href="http://www.nokia.com/privacypolicy">Privacy Policy</a></li>
-			<span>Copyright &copy; 2008 Nokia. All rights reserved</span>
-		</ul>
-		<br /><br />
-	</div>
-</div>
-
-<script type="text/javascript" src="/NOKIA_COM_1/javascript/flash_detection_main.js"></script> <!-- for redirection to mobile site -->
-<script type="text/javascript" src="/EUROPE_NOKIA_COM_3/flash/swfobject.js"></script>
-<script type="text/javascript" src="/NOKIA_COM_1/javascript/cookies.js"></script>
-<script type="text/javascript" >
-    // <![CDATA[
-	var so = new SWFObject("/NOKIA_COM_1/Home/Landing_page_2007/wayfinder_assets.swf", "wayfinder", "736", "560", "7");
-    so.addParam("allowscriptaccess", "always");
-	so.addParam("base", "/NOKIA_COM_1/Home/Landing_page_2007/");
-	so.write("flashcontent");
-    // ]]>
-</script>
-
-<!-- End template '/templates/content/plain.jsp' --> 
-    <!--stopindex-->      
-
-
-
-
-
-  </div>
-</body>
-
-
-  </html>
-
diff --git a/examples/xml/htmlinfo/resources.qrc b/examples/xml/htmlinfo/resources.qrc
index a8cf88d57b..f427d9db10 100644
--- a/examples/xml/htmlinfo/resources.qrc
+++ b/examples/xml/htmlinfo/resources.qrc
@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>apache_org.html</file>
-        <file>nokia_com.html</file>
         <file>simpleexample.html</file>
         <file>trolltech_com.html</file>
         <file>w3c_org.html</file>
author	Liang Qi <liang.qi@theqtcompany.com>	2016-04-07 10:47:20 +0200
committer	Liang Qi <liang.qi@theqtcompany.com>	2016-04-07 10:47:20 +0200
commit	ee0951d69b38f766e67262487be95b88501aa4a5 (patch)
tree	116c334060500be340d4d61c99026316b0df3ce9 /examples/xml
parent	0bb645b1ccc5a9d57b21cf0b2c4306b8e48c611c (diff)
parent	d37239aa419ee4adff4b0a8d5c1403cadff72319 (diff)