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: (71 commits)
  Autotest: increase wait time to 3s on Windows to bypass 2s-granularity limitation
  Autotest: update to the new values for the locale
  do not expand variables in read()'s file name
  remove ability to use break() a block outside any loop
  don't add -unix to the qmake command line
  Increase the timeout for the QNAM getter test to 30 seconds
  Remove unstable hosts from the list
  qdoc: Output TOC for more class ref pages.
  Other fixes to the remote network stresstester
  Fix SSL connection problem.
  Make sure we don't try URLs that aren't HTTP or HTTPS
  Fix menu bar visibility.
  Add SSL remote host tests
  Split the remote and the local tests in two, in preparation for SSL tests
  Add tests for remote hosts
  Change the way we calculate the average transfer rates.
  Finish renaming
  Move these tests to tests/manual.
  Add a QNetworkAccessManager stresstest
  Add a non-blocking native function too
  ...

1 files changed, 946 insertions, 0 deletions

diff --git a/tools/qdoc3/test/style/style.css b/tools/qdoc3/test/style/style.css
new file mode 100644
index 0000000..1ed49fa
--- /dev/null
+++ b/tools/qdoc3/test/style/style.css
@@ -0,0 +1,946 @@
+@media screen
+{
+    html
+    {
+        color: #000000;
+        background: #FFFFFF;
+    }
+    body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, button, textarea, p, blockquote, th, td
+    {
+        margin: 0;
+        padding: 0;
+    }
+    table
+    {
+        border-collapse: collapse;
+        border-spacing: 0;
+    }
+    fieldset, img
+    {
+        border: 0;
+    }
+    address, caption, cite, code, dfn, em, strong, th, var, optgroup
+    {
+        font-style: inherit;
+        font-weight: inherit;
+    }
+    del, ins
+    {
+        text-decoration: none;
+    }
+    li
+    {
+        list-style: none;
+    }
+    caption, th
+    {
+        text-align: left;
+    }
+    h1, h2, h3, h4, h5, h6
+    {
+        font-size: 100%;
+        font-weight: normal;
+    }
+    q:before, q:after
+    {
+        content: '';
+    }
+    abbr, acronym
+    {
+        border: 0;
+        font-variant: normal;
+    }
+    sup
+    {
+        vertical-align: baseline;
+    }
+    sub
+    {
+        vertical-align: baseline;
+    }
+    legend
+    {
+        color: #000000;
+    }
+    input, button, textarea, select, optgroup, option
+    {
+        font-family: inherit;
+        font-size: inherit;
+        font-style: inherit;
+        font-weight: inherit;
+    }
+    input, button, textarea, select
+    {
+        font-size: 100%;
+    }
+    /* Page style */
+    html
+    {
+        background-color: #e5e5e5;
+    }
+    body
+    {
+        background: #e6e7e8 url(../images/page_bg.png) repeat-x 0 0;
+        font: normal 13px/1.2 Verdana;
+        color: #363534;
+    }
+    strong
+    {
+        font-weight: bold;
+    }
+    em
+    {
+        font-style: italic;
+    }
+    .header, .footer, .wrapper
+    {
+        min-width: 600px;
+        max-width: 1500px;
+        margin: 0 30px;
+    }
+    .wrapper
+    {
+        background: url(../images/bg_r.png) repeat-y 100% 0;
+    }
+    .wrapper .hd
+    {
+        padding-left: 216px;
+        height: 15px;
+        background: url(../images/bg_ul.png) no-repeat 0 0;
+        overflow: hidden;
+    }
+    .offline .wrapper .hd
+    {
+        background: url(../images/bg_ul_blank.png) no-repeat 0 0;
+    }
+    .wrapper .hd span
+    {
+        height: 15px;
+        display: block;
+        background: url(../images/bg_ur.png) no-repeat 100% 0;
+        overflow: hidden;
+    }
+    .offline .wrapper .hd span
+    {
+        /*         background: url(../images/bg_ur_blank.png) no-repeat 100% 0; */
+    }
+    .wrapper .bd
+    {
+        background: url(../images/bg_l.png) repeat-y 0 0;
+        position: relative;
+    }
+    .offline .wrapper .bd
+    {
+        background: url(../images/bg_l_blank.png) repeat-y 0 0;
+    }
+    .wrapper .ft
+    {
+        padding-left: 216px;
+        height: 15px;
+        background: url(../images/bg_ll.png) no-repeat 0 0;
+        overflow: hidden;
+    }
+    .offline .wrapper .ft
+    {
+        background: url(../images/bg_ll_blank.png) no-repeat 0 0;
+    }
+    .wrapper .ft span
+    {
+        height: 15px;
+        display: block;
+        background: url(../images/bg_lr.png) no-repeat 100% 0;
+        overflow: hidden;
+    }
+    .header, .footer
+    {
+        display: block;
+        clear: both;
+        overflow: hidden;
+    }
+    .header
+    {
+        height: 115px;
+        position: relative;
+    }
+    .header .icon
+    {
+        position: absolute;
+        top: 13px;
+        left: 0;
+    }
+    .header .qtref
+    {
+        position: absolute;
+        top: 28px;
+        left: 88px;
+        width: 302px;
+        height: 22px;
+    }
+    .header .qtref span
+    {
+        display: block;
+        width: 302px;
+        height: 22px;
+        text-indent: -999em;
+        background: url(../images/header.png) no-repeat 0 0;
+    }
+    /* header elements */
+    #nav-topright
+    {
+        height: 70px;
+    }
+
+    #nav-topright ul
+    {
+        list-style-type: none;
+        float: right;
+        width: 370px;
+        margin-top: 11px;
+    }
+
+    #nav-topright li
+    {
+        display: inline-block;
+        margin-right: 20px;
+        float: left;
+    }
+
+    #nav-topright li.nav-topright-last
+    {
+        margin-right: 0;
+    }
+
+    #nav-topright li a
+    {
+        background: transparent url(../images/sprites-combined.png) no-repeat;
+        height: 18px;
+        display: block;
+        overflow: hidden;
+        text-indent: -9999px;
+    }
+
+    #nav-topright li.nav-topright-home a
+    {
+        width: 65px;
+        background-position: -2px -91px;
+    }
+
+    #nav-topright li.nav-topright-home a:hover
+    {
+        background-position: -2px -117px;
+    }
+
+
+    #nav-topright li.nav-topright-dev a
+    {
+        width: 30px;
+        background-position: -76px -91px;
+    }
+
+    #nav-topright li.nav-topright-dev a:hover
+    {
+        background-position: -76px -117px;
+    }
+
+
+    #nav-topright li.nav-topright-labs a
+    {
+        width: 40px;
+        background-position: -114px -91px;
+    }
+
+    #nav-topright li.nav-topright-labs a:hover
+    {
+        background-position: -114px -117px;
+    }
+
+    #nav-topright li.nav-topright-doc a
+    {
+        width: 32px;
+        background-position: -162px -91px;
+    }
+
+    #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a
+    {
+        background-position: -162px -117px;
+    }
+
+    #nav-topright li.nav-topright-blog a
+    {
+        width: 40px;
+        background-position: -203px -91px;
+    }
+
+    #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a
+    {
+        background-position: -203px -117px;
+    }
+
+    #nav-topright li.nav-topright-shop a
+    {
+        width: 40px;
+        background-position: -252px -91px;
+    }
+
+    #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a
+    {
+        background-position: -252px -117px;
+    }
+
+    #nav-logo
+    {
+        background: transparent url(     "../images/sprites-combined.png" ) no-repeat 0 -225px;
+        left: -3px;
+        position: absolute;
+        width: 75px;
+        height: 75px;
+        top: 13px;
+    }
+    #nav-logo a
+    {
+        width: 75px;
+        height: 75px;
+        display: block;
+        text-indent: -9999px;
+        overflow: hidden;
+    }
+    /* Clearing */
+    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
+    {
+        content: ".";
+        display: block;
+        height: 0;
+        clear: both;
+        visibility: hidden;
+    }
+    /* ^ Clearing */
+
+
+
+    .shortCut-topleft-inactive
+    {
+        padding-left: 3px;
+        background: transparent url(     "../images/sprites-combined.png" ) no-repeat 0px -58px;
+        height: 20px;
+        width: 93px;
+    }
+    .shortCut-topleft-inactive span
+    {
+        font-variant: normal;
+    }
+    #shortCut
+    {
+        padding-top: 10px;
+        font-weight: bolder;
+        color: #b0adab;
+    }
+    #shortCut ul
+    {
+        list-style-type: none;
+        float: left;
+        width: 347px;
+        margin-left: 100px;
+    }
+    #shortCut li
+    {
+        display: inline-block;
+        margin-right: 25px;
+        float: left;
+        white-space: nowrap;
+    }
+    #shortCut li a
+    {
+        color: #b0adab;
+        text-decoration: none;
+    }
+    #shortCut li a:hover
+    {
+        color: #44a51c;
+        text-decoration: none;
+    }
+
+    /* end of header elements */    
+    
+    /* menu element */
+    .sidebar
+    {
+        float: left;
+        margin-left: 5px;
+        width: 200px;
+        font-size: 11px;
+    }
+    .sidebar a
+    {
+        color: #00732f;
+        text-decoration: none;
+    }
+    .offline .sidebar, .offline .feedback
+    {
+        display: none;
+    }
+    .sidebar .searchlabel
+    {
+        padding: 0 0 2px 17px;
+        font: normal bold 11px/1.2 Verdana;
+    }
+    .sidebar .search
+    {
+        padding: 0 15px 0 16px;
+    }
+    .sidebar .search form
+    {
+        width: 167px;
+        height: 21px;
+        padding: 2px 0 0 5px;
+        background: url(../images/form_bg.png) no-repeat 0 0;
+    }
+    .sidebar .search form fieldset input#searchstring
+    {
+        width: 158px;
+        height: 19px;
+        padding: 0;
+        border: none;
+        outline: none;
+        font: 13px/1.2 Verdana;
+    }
+    .sidebar .box
+    {
+        padding: 17px 15px 5px 16px;
+    }
+    .sidebar .box .first
+    {
+        background-image: none;
+    }
+    .sidebar .box h2
+    {
+        font: normal 18px/1.2 Arial;
+        padding: 15px 0 0 40px;
+        min-height: 32px;
+    }
+    .sidebar .box#lookup h2
+    {
+        background: url(../images/api_lookup.png) no-repeat 0 0;
+    }
+    .sidebar .box#topics h2
+    {
+        background: url(../images/api_topics.png) no-repeat 0 0;
+    }
+    .sidebar .box#examples h2
+    {
+        background: url(../images/api_examples.png) no-repeat 0 0;
+    }
+    .sidebar .box .list
+    {
+        display: block;
+    }
+    .sidebar .box .live
+    {
+        display: none;
+        height: 100px;
+        overflow: auto;
+    }
+    .list li a:hover, .live li a:hover
+    {
+        text-decoration: underline;
+    }
+    .sidebar .box ul li
+    {
+        padding-left: 12px;
+        background: url(../images/bullet_gt.png) no-repeat 0 5px;
+        margin-bottom: 15px;
+    }
+    .sidebar .bottombar
+    {
+        background: url(../images/box_bg.png) repeat-x 0 bottom;
+    }
+    /* content elements */
+    .wrap
+    {
+        overflow: hidden;
+    }
+    .offline .wrap
+    {
+        margin: 0 5px 0 5px;
+    }
+    /* tool bar */
+    .wrap .toolbar
+    {
+        background-color: #fafafa;
+        border-bottom: 1px solid #d1d1d1;
+        height: 20px;
+        margin-left: 3px;
+        margin-right: 5px;
+        position: relative;
+    }
+    .wrap .toolbar .toolblock
+    {
+        position: absolute;
+    }
+    .wrap .toolbar .breadcrumb
+    {
+        font-size: 11px;
+        line-height: 1;
+        padding: 0 0 10px 21px;
+        height: 10px;
+    }
+    .wrap .toolbar .toolbuttons
+    {
+        padding: 0 0 10px 21px;
+        right: 5px;
+        vertical-align: top;
+        overflow: hidden;
+    }
+    .wrap .toolbar .toolbuttons .active
+    {
+        color: #00732F;
+    }
+    .wrap .toolbar .toolbuttons ul
+    {
+        float: right;
+    }
+    .wrap .toolbar .toolbuttons li
+    {
+        float: left;
+        text-indent: -10px;
+        margin-top: -5px;
+        margin-right: 15px;
+        font-weight: bold;
+        color: #B0ADAB;
+    }
+    #smallA
+    {
+        font-size: 10pt;
+    }
+    #medA
+    {
+        font-size: 12pt;
+    }
+    #bigA
+    {
+        font-size: 14pt;
+    }
+    #smallA:hover, #medA:hover, #bigA:hover
+    {
+        color: #00732F;
+    }
+    #print
+    {
+        font-size: 14pt;
+        line-height: 20pt;
+    }
+    #printIcon
+    {
+        margin-left: 5px;
+    }
+    /* bread crumbs */
+    .wrap .breadcrumb ul li
+    {
+        float: left;
+        background: url(../images/breadcrumb.png) no-repeat 0 3px;
+        padding-left: 15px;
+        margin-left: 15px;
+        font-weight: bold;
+    }
+    .wrap .breadcrumb ul li.last
+    {
+        font-weight: normal;
+    }
+    .wrap .breadcrumb ul li.first
+    {
+        background-image: none;
+        padding-left: 0;
+        margin-left: 0;
+    }
+    .wrap .content
+    {
+        padding: 30px;
+        position: relative;
+    }
+    /* text elements */
+    .heading
+    {
+        font: normal 600 16px/1.0 Arial;
+        padding-bottom: 15px;
+    }
+
+    .subtitle
+    {
+        font-size: 13px;
+    }
+
+    .small-subtitle
+    {
+        font-size: 13px;
+    }
+    
+    .wrap .content h1
+    {
+        font: 600 18px/1.2 Arial;
+        padding-bottom: 15px;
+    }
+    .wrap .content h2
+    {
+        font: 600 16px/1.2 Arial;
+    }
+    .wrap .content h3
+    {
+        font: 600 14px/1.2 Arial;
+    }
+    .wrap .content p
+    {
+        line-height:20px;
+        padding:10px 5px 10px 5px;
+    }
+    .wrap .content ul
+    {
+        padding-left: 25px;
+    }
+    .wrap .content li
+    {
+        padding-left: 12px;
+        background: url(../images/bullet_sq.png) no-repeat 0 5px;
+        font: normal 400 10pt/1 Verdana;
+        margin-bottom: 10px;
+        line-height: 14px;
+    }
+    a
+    {
+        color: #00732F;
+        text-decoration: none;
+    }
+    a:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+    .content a:visited
+    {
+        color: #4c0033;
+        text-decoration: none;
+    }
+    .offline .wrap .content
+    {
+        padding-top: 15px;
+    }
+    .footer
+    {
+        min-height: 100px;
+        color: #797775;
+        font: normal 9px/1 Verdana;
+        text-align: center;
+        padding-top: 40px;
+    }
+    .feedback
+    {
+        float: right;
+        padding-right: 10px;
+        font: normal 8px/1 Verdana;
+        color: #B0ADAB;
+    }
+    .feedback:hover
+    {
+        float: right;
+        font: normal 8px/1 Verdana;
+        color: #00732F;
+        text-decoration: underline;
+    }
+    hr
+    {
+        background-color: #e0e0e0;
+        height: 1px;
+        width: 100%;
+        text-align: left;
+        margin: 15px 0px 15px 0px;
+    }
+    
+    .content .alignedsummary
+    {
+        margin: 15px;
+    }
+    /* tables */
+    table, pre
+    {
+        -moz-border-radius: 7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border: 1px solid #E6E6E6;
+        border-collapse: separate;
+        font-size: 11px; 
+        min-width: 395px; 
+        margin-bottom: 25px;
+    }
+    thead{margin-top: 5px;}
+    th{ padding: 3px 15px 3px 15px;}
+    td{padding: 3px 15px 3px 20px;}
+    table tr.odd
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #F6F6F6; 
+        color: #66666E;
+    }
+    table tr.even
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #ffffff;
+        color: #66666E;
+    }
+    table tr.odd:hover
+    {
+        background-color: #E6E6E6; 
+    }
+    table tr.even:hover
+    {
+        background-color: #E6E6E6;
+    }
+    span.comment
+    {
+        color: #8B0000;
+        font-style: italic;
+    }
+    span.string, span.char
+    {
+        color: #254117;
+    }
+    pre
+    {
+        -moz-border-radius:7px 7px 7px 7px;
+        background-color:#F6F6F6;
+        border:1px solid #DDDDDD;
+        margin:0 20px 10px 10px;
+        padding:20px 15px 20px 20px;
+        overflow-x:auto;
+    }
+    .qmltype
+    {
+        text-align: center;
+        font-size: 160%;
+    }
+    .qmlreadonly
+    {
+        float: right;
+        color: #254117;
+    }
+    #feedbackBox
+    {
+        display:none;
+        -moz-border-radius:7px 7px 7px 7px;
+        border:1px solid #DDDDDD;
+        position:fixed;
+        top:100px;
+        left: 33%;
+        height: 190px;
+        width: 400px;
+        padding: 5px;
+        background-color: #e6e7e8;
+        z-index: 4;
+    }
+    #feedcloseX a
+    {
+        display:inline;
+        padding: 5px 5px 0 0;
+        margin-bottom:3px;
+        color: #363534;
+        font-weight:600;
+        float: right;
+        text-decoration: none;
+    }
+    #feedbox
+    /* here */
+    {
+        display:inline;
+        width: 370px;
+        height: 120px;
+        margin:0px 25px 10px 15px;
+    }
+    #feedsubmit
+    {
+        display:inline;
+        float:right;
+        margin:4px 32px 0 0;
+    }
+    #blurpage
+    {
+        display: none;
+        position: fixed;
+        float: none;
+        top: 0px;
+        left: 0px;
+        right: 0px;
+        bottom: 0px;
+        background: transparent url(../images/feedbackground.png) 0 0;
+        z-index: 3;
+    }
+    .toc
+    {
+        float: right; 
+        -moz-border-radius:7px 7px 7px 7px;
+        background-color:#F6F6F6;
+        border:1px solid #DDDDDD;
+        margin:0 20px 10px 10px;
+        padding:20px 15px 20px 20px;
+        height: auto;
+        width: 200px;
+    }
+
+    .toc ul
+    {
+        float: left;
+        padding: 15px;
+        
+    }
+  
+
+    .content .toc li
+    {
+        font: normal 12px/1.2 Verdana;
+        background: url(../images/bullet_dn.png) no-repeat 0 5px;
+    }
+
+    .relpage 
+    {
+        -moz-border-radius: 7px 7px 7px 7px;
+        border: 1px solid #DDDDDD;
+        padding: 25px 25px;
+        clear:both;
+    }
+    .relpage ul
+    {
+        float: none;
+        padding: 15px;
+    }
+    .content .relpage li 
+    {
+        font: normal 11px/1.2 Verdana;
+    }
+    /* edit */
+    h3.fn, span.fn
+    {
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        font-weight: bold; 
+        /*  padding: 6px 0px 6px 10px;*/
+         /*     margin: 42px 0px 0px 0px;*/
+    }
+    /* edit */
+
+    .indexbox
+    {
+        width: 100%; 
+    }
+    .content .indexboxcont li
+    {
+        font: normal 600 13px/1 Verdana;
+    }
+
+ /*   .indexbox a
+    {
+        color: #00732f;
+        text-decoration: none;
+    }*/
+    .indexbox a:hover, .indexbox a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+    .indexbox a:visited
+    {
+        color: #00732f;
+        text-decoration: none;
+    }
+
+    .indexboxcont
+    {
+        display: block;
+    }
+
+    .indexboxbar
+    {
+        background: transparent url(     "../images/horBar.png" ) repeat-x left bottom;
+        margin-bottom: 25px;
+    }
+
+    .indexboxcont .section
+    {
+        display: inline-block; 
+        width: 49%; 
+        *width:42%;
+        _width:42%;
+        padding:0 2% 0 1%;
+        vertical-align:top;
+}
+
+    .indexboxcont .indexIcon
+    { 
+        width: 11%; 
+        *width:18%;
+        _width:18%;
+        overflow:hidden;
+}
+    .indexboxcont .section p
+    { 
+        padding-top: 20px;
+        padding-bottom: 20px;
+    }
+
+    .indexboxcont .sectionlist
+    {
+        display: inline-block;
+        width: 33%;
+        margin-right: -2px;
+        vertical-align: top;
+        padding: 0;
+    }
+    .tricol
+    {
+       
+    }
+    .indexboxcont .sectionlist ul
+    {
+        padding-left: 15px;
+        margin-bottom: 20px;
+    }
+/*
+    .indexboxcont .sectionlist ul li
+    {
+        line-height: 12px;
+    }
+*/
+    .lastcol
+    {
+        display: inline-block;
+        vertical-align: top;
+        padding: 0;
+        max-width: 25%;
+    }
+
+    .tricol .lastcol
+    {
+        margin-left:-6px;
+    }
+
+    /*.toc ul*/
+
+    /* end page elements */
+}
+/* end of screen media */
+
+/* start of print media */
+
+@media print
+{
+    .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft
+    {
+        display: none;
+        background: none;
+    }
+    .content
+    {
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        background: none;
+        display: block;
+    }
+}
+/* end of print media */