\n" \
- "
\n" \
- " \n" \
- "
\n" \
+ "\n" \
- "
\n" \
- " \n" \
- " \n" \
- " ![\"Qt\"](\"images/Qt-logo.png\")
\n" \
- " \n" \
- "
\n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
+ "\n" \
+ " \n" \
+ "
![](\"http://qt.io/wp-content/themes/oneqt/assets/images/cookie_small.png\")
\n" \
+ " \n" \
+ " \n" \
+ "
\n" \
+ "\n" \
+ "
\n" \
+ "
\n" \
- " \n" \ + " \n" \ + "
\n" \ "\n" \
- "
\n" \
- " \n" \
+ "\n" \
+ "
\n" \
+ "\n" \
+ "
\n" \
+ "\n" \
+ " \n" \
+ "
\n" \
"\n" \
"
\n" \
- "
\n" \
+ "
\n"
+
+HTML.prologue = \
+ "');
+ $li.find('a').text(entry.categories[j]);
+ $article.find('.taglist').append($li);
+ }
+ } catch(e) {}
+ }
+ if (result.feed.link && result.feed.link != "") {
+ var linkHtml = 'Show all';
+ $container.append(linkHtml);
+ }
+ }
+ });
+ },
+
+ extraLinksToMain: function() {
+ var extramenuLinks = $('#menuextras').find('li');
+ var mainmenu = $('#mainmenu');
+ var count = 0;
+ if ($(extramenuLinks).length > 3) {
+ $(extramenuLinks).each(function() {
+ if (count < 3) {
+ var newLink = $(this);
+ $(newLink).addClass('dynamic-add');
+ $(mainmenu).append(newLink);
+ }
+ count++;
+ });
+ }
+ },
+
+ mainLinkstoExtra: function() {
+ var mainmenuLinks = $('#mainmenu').find('.dynamic-add');
+ var extramenu = $('#menuextras');
+ var count = 0;
+ $(mainmenuLinks).each(function() {
+ var newLink = $(this);
+ $(extramenu).prepend(newLink);
+ count++;
+ });
+ }
+}
diff --git a/doc/global/template/style/doc_search.png b/doc/global/template/style/doc_search.png
new file mode 100644
index 00000000000..0d7bccd46f9
Binary files /dev/null and b/doc/global/template/style/doc_search.png differ
diff --git a/doc/global/template/style/gsc.css b/doc/global/template/style/gsc.css
new file mode 100644
index 00000000000..e3d6391d6b5
--- /dev/null
+++ b/doc/global/template/style/gsc.css
@@ -0,0 +1,192 @@
+.gsc-control-cse table, table td, table th {
+ border: none !important;
+ margin-bottom: 10px !important
+}
+.gsc-control-cse {
+ width: 100% !important;
+ box-sizing: border-box !important
+}
+.gsc-control-cse * {
+ font-family: 'Open Sans', Arial, Helvetica, sans-serif !important;
+ line-height: 1.5 !important;
+ font-weight: 300 !important
+}
+.gsc-control-cse,
+.gsc-control-cse .gsc-table-result {
+ width: 100% !important;
+ font-family: 'Open Sans', Arial, Helvetica, sans-serif !important;
+ font-weight: 300 !important;
+ font-size: 13px !important
+}
+.gsc-resultsHeader {
+ width: 100% !important;
+ clear: both !important
+}
+.gsc-resultsHeader td.gsc-twiddleRegionCell {
+ width: 75% !important
+}
+.gsc-resultsbox-visible {
+ display: block !important
+}
+.gsc-resultsbox-invisible {
+ display: none !important
+}
+.gsc-results {
+ padding-bottom: 2px !important;
+ width: 99% !important
+}
+.gsc-result {
+ margin-bottom: 10px !important
+}
+.gsc-result .gs-title {
+ height: 1.4em !important;
+ overflow: hidden !important
+}
+.gsc-result div.gs-watermark {
+ display: none !important
+}
+.gsc-results .gsc-result img.gs-ad-marker {
+ display: none !important
+}
+.gsc-webResult:after {
+ content: "." !important;
+ display: block !important;
+ height: 0 !important;
+ clear: both !important;
+ visibility: hidden !important
+}
+.gsc-webResult {
+ zoom: 1 !important
+}
+.gsc-webResult .gsc-result {
+ margin: 0 !important;
+ padding: .5em 0 !important;
+ border-bottom: 1px solid #ebebeb !important
+}
+.gsc-above-wrapper-area {
+ border-bottom: 1px solid #E9E9E9 !important;
+ padding: 5px 0 5px 0 !important
+}
+.gsc-above-wrapper-area-invisible {
+ display: none !important
+}
+.gsc-above-wrapper-area-container {
+ width: 100% !important
+}
+.gsc-result-info {
+ text-align: left !important;
+ color: #676767 !important;
+ font-size: 13px !important;
+ padding-left: 8px !important;
+ margin: 10px 0 10px 0 !important
+}
+.gsc-result-info-container {
+ text-align: left !important
+}
+.gsc-result-info-invisible {
+ display: none !important
+}
+.gsc-orderby-container {
+ text-align: right !important;
+ background: transparent !important
+}
+.gsc-orderby-invisible {
+ display: none !important
+}
+.gsc-orderby-label {
+ color: #676767 !important;
+ padding: 5px 5px 6px 0 !important
+}
+.gsc-selected-option-container {
+ background-color: transparent !important;
+ border: 1px solid #eee !important;
+ border: 1px solid rgba(0, 0, 0, 0.1) !important;
+ border-radius: 2px !important;
+ box-shadow: none !important;
+ color: #444 !important;
+ cursor: default !important;
+ font-size: 11px !important;
+ font-weight: bold !important;
+ height: 20px !important;
+ line-height: 20px !important;
+ max-width: 90% !important;
+ min-width: 54px !important;
+ outline: 0 !important;
+ padding: 0 28px 0 6px !important;
+ position: relative !important;
+ text-align: center !important;
+ width: 50px !important !important
+}
+.gsc-selected-option {
+ position: relative !important;
+ width: 100% !important;
+}
+.gsc-control-cse .gsc-option-selector {
+ border: none !important;
+ height: 11px !important;
+ margin-top: -4px !important;
+ position: absolute !important;
+ right: 5px !important;
+ top: 8px !important;
+ width: 7px !important;
+ padding: 0 5px 0 5px !important;
+ background: url(//ssl.gstatic.com/ui/v1/disclosure/small-grey-disclosure-arrow-down.png) center no-repeat
+}
+.gsc-results .gsc-cursor-box .gsc-trailing-more-results {
+ margin-bottom: 0 !important;
+ display: inline !important
+}
+.gsc-results .gsc-cursor {
+ display: inline !important
+}
+.gsc-results .gsc-cursor-box {
+ margin: 10px 5px 10px !important
+}
+.gsc-results .gsc-cursor-box .gsc-cursor-page {
+ cursor: pointer !important;
+ color: #000000 !important;
+ text-decoration: underline !important;
+ margin-right: 8px !important;
+ display: inline !important
+}
+.gsc-results .gsc-cursor-box .gsc-cursor-current-page {
+ cursor: default !important;
+ color: white !important;
+ background-color: #5caa15 !important;
+ font-weight: bold !important;
+ text-decoration: none !important;
+ padding: 0 3px 0 3px !important;
+ margin-top: 10px !important;
+ cursor: pointer !important
+}
+.gs-result .gs-title,
+.gs-result .gs-title * {
+ color: #5caa15 !important;
+ text-decoration: underline !important
+}
+.gs-webResult div.gs-visibleUrl-long,
+.gs-promotion div.gs-visibleUrl-long {
+ overflow: hidden !important;
+ display: none !important
+}
+.gs-webResult div.gs-per-result-labels a.gs-label {
+ text-decoration: underline !important;
+ cursor: pointer !important;
+ padding: 3px !important;
+ color: #26282a !important
+}
+.gs-webResult div.gs-per-result-labels a.gs-label.gs-labelActive {
+ cursor: default !important;
+ text-decoration: none !important
+}
+.gsc-control-cse:after {
+ content: "." !important;
+ display: block !important;
+ clear: both !important;
+ height: 0 !important;
+ visibility: hidden !important
+}
+
+*:first-child + html .gsc-inline-block {
+ display: inline !important
+}
diff --git a/doc/global/template/style/icomoon.eot b/doc/global/template/style/icomoon.eot
new file mode 100755
index 00000000000..68f0fa6ae6f
Binary files /dev/null and b/doc/global/template/style/icomoon.eot differ
diff --git a/doc/global/template/style/icomoon.svg b/doc/global/template/style/icomoon.svg
new file mode 100755
index 00000000000..3246f83769d
--- /dev/null
+++ b/doc/global/template/style/icomoon.svg
@@ -0,0 +1,20 @@
+
+
+
\ No newline at end of file
diff --git a/doc/global/template/style/icomoon.ttf b/doc/global/template/style/icomoon.ttf
new file mode 100755
index 00000000000..4518527c8b4
Binary files /dev/null and b/doc/global/template/style/icomoon.ttf differ
diff --git a/doc/global/template/style/icomoon.woff b/doc/global/template/style/icomoon.woff
new file mode 100755
index 00000000000..5c8466c40fb
Binary files /dev/null and b/doc/global/template/style/icomoon.woff differ
diff --git a/doc/global/template/style/list_arrow.png b/doc/global/template/style/list_arrow.png
new file mode 100644
index 00000000000..a6a6be665bf
Binary files /dev/null and b/doc/global/template/style/list_arrow.png differ
diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css
index 5d0cd7ecfb8..d558137e2ed 100644
--- a/doc/global/template/style/online.css
+++ b/doc/global/template/style/online.css
@@ -1,1073 +1,1590 @@
-img {
- -moz-box-shadow: 3px 3px 3px #ccc;
- -webkit-box-shadow: 3px 3px 3px #ccc;
- box-shadow: 3px 3px 3px #ccc;
- border: #8E8D8D 2px solid;
- margin-left: 0px;
- max-width: 800px;
- height: auto;
+#navbar {
+ position:fixed;
+ top:0;
+ left:0;
+ z-index:100;
+ background:#fff;
+ width:100%
}
-
-.content {
- margin: 15px
+#navbar .container {
+ overflow:visible
}
-
-.content .indexboxcont li {
- font: normal bold 13px/1 Verdana
+.fixed .container {
+ overflow:visible
+}
+.box-shadowed-nav #navbar {
+ border-bottom:1px solid #eee
+}
+#navbar .navbar-header {
+ position:relative
+}
+#navbar .navbar-toggle {
+ display:none;
+ float:right;
+ line-height:18px;
+ min-width:95px;
+ position:relative;
+ text-align:center;
+ margin:10px 0 0 0
+}
+#navbar .navbar-toggle:hover figure {
+ background:#5caa15
+}
+#navbar .navbar-toggle span {
+ color:#bdbebf;
+ font-weight:300
+}
+#navbar .navbar-toggle figure {
+ background:#7fc241;
+ border-radius:100%;
+ -webkit-border-radius:100%;
+ -moz-border-radius:100%;
+ transition:all 0.2s ease-in-out;
+ -webkit-transition:all 0.2s ease-in-out;
+ -moz-transition:all 0.2s ease-in-out;
+ -ms-transition:all 0.2s ease-in-out;
+ -o-transition:all 0.2s ease-in-out;
+ height:26px;
+ width:34px;
+ padding:8px 0 0 0;
+ margin-top:3px;
+ margin-left:auto;
+ margin-right:auto;
+ text-align:center
+}
+#navbar .navbar-toggle figure span.line {
+ display:inline-block;
+ width:1.125em;
+ height:0.1875em;
+ background:#fff;
+ transition:0.3s;
+ position:relative;
+ vertical-align:middle;
+ margin-top:-3px
+}
+#navbar .navbar-toggle figure span.line:before,#navbar .navbar-toggle figure span.line:after {
+ display:inline-block;
+ width:1.125em;
+ height:0.1875em;
+ background:#fff;
+ position:absolute;
+ left:0;
+ content:'';
+ -webkit-transform-origin:0.28571rem center;
+ transform-origin:0.28571rem center;
+ transition:0.3s;
+ -webkit-transition:0.3s;
+ -moz-transition:0.3s;
+ -ms-transition:0.3s;
+ -o-transition:0.3s
+}
+#navbar .navbar-toggle figure span.line:before {
+ top:6px
+}
+#navbar .navbar-toggle figure span.line:after {
+ top:-6px
+}
+#navbar .navbar-toggle.opened figure {
+ background:#5caa15
+}
+#navbar .navbar-toggle.opened span {
+ color:#5caa15
+}
+#navbar .navbar-toggle.opened span.line {
+ background:transparent
+}
+#navbar .navbar-toggle.opened span.line:before,#navbar .navbar-toggle.opened span.line:after {
+ -webkit-transform-origin:50% 50%;
+ -moz-transform-origin:50% 50%;
+ transform-origin:50% 50%;
+ top:0;
+ width:23px;
+ margin-left:-2px
+}
+#navbar .navbar-toggle.opened span.line:before {
+ transform:rotate3d(0, 0, 1, 45deg);
+ -webkit-transform:rotate3d(0, 0, 1, 45deg);
+ -moz-transform:rotate3d(0, 0, 1, 45deg);
+ -ms-transform:rotate3d(0, 0, 1, 45deg);
+ -o-transform:rotate3d(0, 0, 1, 45deg);
+ left:0
+}
+#navbar .navbar-toggle.opened span.line:after {
+ transform:rotate3d(0, 0, 1, -45deg);
+ -webkit-transform:rotate3d(0, 0, 1, -45deg);
+ -moz-transform:rotate3d(0, 0, 1, -45deg);
+ -ms-transform:rotate3d(0, 0, 1, -45deg);
+ -o-transform:rotate3d(0, 0, 1, -45deg)
+}
+#navbar .navbar-oneQt {
+ display:inline;
+ float:left;
+ width:31px;
+ padding:20px 8px;
+ margin:0 15px 0 0
+}
+#navbar .navbar-oneQt:before {
+ content:attr(data-icon);
+ position:absolute;
+ top:15px;
+ left:0;
+ color:#80c342;
+ font-family:'Qt Icons';
+ line-height:1;
+ font-size:3.125em;
+ transition:all 0.2s ease-in-out;
+ -webkit-transition:all 0.2s ease-in-out;
+ -moz-transition:all 0.2s ease-in-out;
+ -ms-transition:all 0.2s ease-in-out;
+ -o-transition:all 0.2s ease-in-out
+}
+.navbar-oneQt {
+ color: #80c342 !important;
+}
+.navbar-oneQt:hover {
+ color: #80c342;
+}
+#navbar .navbar-menu {
+ width:auto;
+ float:left
+}
+.lt-ie9 #navbar {
+ border-bottom:1px solid #ddd
+}
+#mainmenu {
+ float:left;
+ list-style:none
+}
+#mainmenu li {
+ float:left;
+ margin-left:0;
+ list-style-type:none !important
+}
+#mainmenu li a {
+ display:block;
+ padding:29px 0.7em;
+ font-size:1.125em;
+ font-weight:300;
+ line-height:20px;
+ height:80px;
+ color:#26282a;
+ text-decoration:none;
+ border:0px solid #80c342;
+ -webkit-transition:all 0.2s ease-in-out;
+ box-sizing:border-box;
+ -webkit-box-sizing:border-box;
+ -moz-box-sizing:border-box;
+ *behavior:url(boxsizing.htc)
+}
+#mainmenu li a:hover {
+ color:#5caa15;
+ border-bottom:4px solid #80C342
+}
+#mainmenu li.current-menu-item a {
+ color:#5caa15;
+ border-bottom:4px solid #80C342
+}
+#menuextras, #mainmenu, #menuextraslanguages {
+ margin-bottom:0
}
-
-.content .normallist li {
- font: normal 13px/1 Verdana
- }
-
-.descr {
- margin-top: 35px;
- /*max-width: 75%;*/
- margin-left: 5px;
- text-align: left;
- vertical-align: top;
+#menuextras {
+ display:inline-block;
+ float:right;
+ list-style-type:none;
+ margin-right:0;
+ margin-left:0;
+ letter-spacing:-0.31em;
+ line-height:0
}
-
-.name {
- max-width: 75%;
- font-weight: 100;
+#menuextras li {
+ letter-spacing:normal;
+ float:left;
+ display:inline-block
}
-
-tt {
- text-align: left
+#menuextras li a {
+ display:inline-block;
+ text-align:center;
+ height:80px;
+ border-left:1px solid #eee;
+ padding-top:14px;
+ box-sizing:border-box;
+ overflow:hidden;
+ min-width:85px;
+ font-weight:100
}
-
-/*
------------
-links
------------
-*/
-
-.flags {
- text-decoration: none;
- text-height: 24px;
+#menuextras li a:before {
+ display:inline-block;
+ font-family:'Qt Icons';
+ content:attr(data-icon);
+ font-size:2.125em;
+ width:100%;
+ color:#80c342;
+ line-height:1;
+ transition:all 0.2s ease-in-out;
+ -webkit-transition:all 0.2s ease-in-out;
+ -moz-transition:all 0.2s ease-in-out;
+ -ms-transition:all 0.2s ease-in-out;
+ -o-transition:all 0.2s ease-in-out
}
-
-.flags:target {
- background-color: #FFFFD6;
+#menuextras li a:hover:before {
+ color:#5caa15
}
-
-/*
--------------------------------
-NOTE styles
--------------------------------
-*/
-
-.notetitle, .tiptitle, .fastpathtitle {
- font-weight: bold
+#menuextras .search.open a {
+ color:#006325
}
-
-.attentiontitle, .cautiontitle, .dangertitle, .importanttitle, .remembertitle, .restrictiontitle {
- font-weight: bold
+#menuextras .search a {
+ border-right:1px solid #eee
}
-
-.note, .tip, .fastpath {
- background: #F2F2F2 url('../images/ico_note.png');
- background-repeat: no-repeat;
- background-position: top left;
- padding: 5px;
- padding-left: 40px;
- padding-bottom: 10px;
- border: #999 1px dotted;
- color: #666666;
- margin: 5px;
+#menuextras li a span {
+ color:#bdbebf;
+ display:inline-block;
+ overflow:hidden;
+ max-height:30px;
+ transition:max-height 0.2s ease-in-out;
+ -webkit-transition:max-height 0.2s ease-in-out;
+ -moz-transition:max-height 0.2s ease-in-out;
+ -ms-transition:max-height 0.2s ease-in-out;
+ -o-transition:max-height 0.2s ease-in-out;
+ line-height:1.4;
+ font-size:0.875em
}
-
-.attention, .caution, .danger, .important, .remember, .restriction {
- background: #F2F2F2 url('../images/ico_note_attention.png');
- background-repeat: no-repeat;
- background-position: top left;
- padding: 5px;
- padding-left: 40px;
- padding-bottom: 10px;
- border: #999 1px dotted;
- color: #666666;
- margin: 5px;
-}
-
-.qtref {
- display: block;
- top: -76px;
- z-index: 1;
- font-size: 11px;
- padding-right: 10px;
- float: right;
-}
-
-.naviNextPrevious {
- display: block;
- text-align: right;
- float: right;
- z-index: 1;
- padding-right: 10px;
- padding-top: 4px;
-}
-
-.naviNextPrevious > a.nextPage {
- background-image: url('../images/btn_next.png');
- background-repeat: no-repeat;
- background-position: right;
- padding-right: 20px;
- height: 20px;
- margin-left: 30px;
- }
-
-.naviNextPrevious > a.prevPage {
- background-image: url('../images/btn_prev.png');
- background-repeat: no-repeat;
- background-position: left;
- padding-left: 20px;
- height: 20px;
- padding-left: 20px;
- }
-
-.navigationbar {
- background-repeat: no-repeat;
- height: 33px;
- margin: 0px !important;
- padding: 0px !important;
- border-bottom: 1px solid rgb(209, 209, 209);
- background-image: -moz-linear-gradient(center top , rgb(246, 245, 245), rgb(239, 239, 239));
- background-image: -webkit-gradient( linear, left bottom, left top, color-stop(0.0, #efefef), color-stop(0.5, #f6f5f5) );
- border-radius: 10px 10px 0px 0px;
-}
-
-.navigationbar ul {
- margin: 0px;
- padding: 8px 0px 15px 15px;
- height: 20px;
- }
-
-.navigationbar li {
- list-style-type: none;
- float: left;
- font-size: 15px;
- }
-
- .navigationbar li a {
- display: block;
- text-decoration: none;
- background: url('../images/arrow_bc.png');
- background-repeat: no-repeat;
- background-position: right;
- padding-right: 25px;
- font-size: inherit;
+@media (min-width: 1120px) {
+ #navbar.fixed,#navbar.shadow_bottom {
+ -moz-box-shadow:0px 0px 8px rgba(0,0,0,0.2);
+ -webkit-box-shadow:0px 0px 8px rgba(0,0,0,0.2);
+ box-shadow:0px 0px 8px rgba(0,0,0,0.2)
}
-
-#buildversion {
- font-style: italic;
- font-size: small;
- float: right;
- margin-right: 5px;
-}
-
-/*
------------
-headers
------------
-*/
-
-@media screen {
- .title {
- color: #313131;
- font-size: 18px;
- font-weight: normal;
- left: 0;
- padding-bottom: 20px;
- padding-left: 10px;
- padding-top: 20px;
- border-bottom: 1px #CCC solid;
- font-weight: bold;
- margin-left: 0px;
- margin-right: 0px;
- }
-}
-
-h1 {
- margin: 0
-}
-
-h2, p.h2 {
- font: 500 16px/1.2 Arial;
- font-weight: 100;
- background-color: #F2F3F4;
- padding: 4px;
- padding-left: 14px;
- margin-bottom: 30px;
- margin-top: 30px;
- margin-left: -10px;
- margin-right: -5px;
- border-top: #E0E0DE 1px solid;
- border-bottom: #E0E0DE 1px solid;
- max-width: 99%;
- overflow: hidden;
-}
-
-h2:target {
- background-color: #F2F3D4;
-}
-
-h3 {
- font: 500 14px/1.2 Arial;
- font-weight: 100;
- text-decoration: underline;
- margin-bottom: 30px;
- margin-top: 30px;
-}
-
-h3.fn:target {
- background-color: #F6F6D6;
-}
-
-h3.fn, span.fn {
- border-width: 1px;
- border-style: solid;
- border-color: #E6E6E6;
- -moz-border-radius: 7px 7px 7px 7px;
- -webkit-border-radius: 7px 7px 7px 7px;
- border-radius: 7px 7px 7px 7px;
- background-color: #F6F6F6;
- word-spacing: 3px;
- padding: 5px 5px;
- text-decoration: none;
- font-weight: bold;
- max-width: 75%;
- font-size: 14px;
- margin: 0px;
- margin-top: 45px;
-}
-
-.name {
- color: #1A1A1A
-}
-
-.type {
- color: #808080
-}
-
-@media print {
- .title {
- color: #0066CB;
- font-size: 32px;
- font-weight: normal;
- left: 0;
- position: absolute;
- right: 0;
- top: 0;
- }
-}
-
-/*
------------------
-table styles
------------------
-*/
-
-.table img {
- border: none;
- margin-left: 0px;
- -moz-box-shadow: 0px 0px 0px #fff;
- -webkit-box-shadow: 0px 0px 0px #fff;
- box-shadow: 0px 0px 0px #fff;
-}
-
-/* table with border alternative colours*/
-
-table, pre {
- -moz-border-radius: 7px 7px 7px 7px;
- -webkit-border-radius: 7px 7px 7px 7px;
- border-radius: 7px 7px 7px 7px;
- background-color: #F6F6F6;
- border: 1px solid #E6E6E6;
- border-collapse: separate;
- font-size: 12px;
- line-height: 1.2;
- margin-bottom: 25px;
- margin-left: 15px;
- font-size: 12px;
- line-height: 1.2;
- margin-bottom: 25px;
- margin-left: 15px;
-}
-
- table tr.even {
- background-color: white;
- color: #66666E;
- }
-
- table tr.odd {
- background-color: #F6F6F6;
- color: #66666E;
- }
-
- table tr:target {
- background-color: #F6F6D6;
- }
-
- table thead {
- text-align: left;
- padding-left: 20px;
- background-color: #e1e0e0;
- border-left: none;
- border-right: none;
- }
-
- table thead th {
- padding-top: 5px;
- padding-left: 10px;
- padding-bottom: 5px;
- border-bottom: 2px solid #D1D1D1;
- padding-right: 10px;
+ #navbar.fixed #menuextras li a,#navbar.shadow_bottom #menuextras li a {
+ padding-top:9px;
+ height:50px
+ }
+ #navbar.fixed #menuextras li a span,#navbar.shadow_bottom #menuextras li a span {
+ max-height:0
+ }
+ #navbar.fixed #menuextras li a:before,#navbar.shadow_bottom #menuextras li a:before {
+ font-size:30px
+ }
+ #navbar.fixed #mainmenu li a {
+ height:50px;
+ padding:14px 0.7em
+ }
+ #navbar.fixed #mainmenu li a:hover {
+ border-bottom:4px solid #5caa15
+ }
+ #navbar.fixed .navbar-toggle {
+ padding:13px 14px 9px
+ }
+ #navbar.fixed #menuextras li.navbar-search {
+ padding:0px 0
+ }
+ #navbar.fixed #menuextras ul.menuextraslinks,#navbar.fixed #menuextras ul.menuextraslanguages {
+ display:none
+ }
+ #navbar.fixed .navbar-oneQt:before {
+ font-size:35px;
+ top:7px
+ }
+ #navbar.fixed #mainmenu li.current-menu-item a {
+ border-bottom:4px solid #80C342
}
-
- table td {
- padding: 3px 15px 3px 20px;
- border-bottom: #CCC dotted 1px;
- }
-
- table th {
- text-align: left;
- padding-left: 20px;
- }
-
- table p {
- margin: 0px
- }
-
-/* table bodless & white*/
-
-.borderless {
- border-radius: 0px 0px 0px 0px;
- background-color: #fff;
- border: 1px solid #fff;
}
-
-.borderless td {
- border: none;
- border-bottom: #fff dotted 1px;
- }
-
-.borderless tr {
- background-color: #FFF;
- color: #66666E;
- }
-
-/*
------------
-List
------------
-*/
-
-ul {
- margin-top: 10px;
+@media (max-width: 1120px) {
+ #navbar {
+ padding:0;
+ position:relative
+ }
+ #navbar .container {
+ max-width:100%
+ }
+ #navbar .menuextraslanguages {
+ bottom:10px !important;
+ right:0
+ }
+ #navbar .menuextraslanguages li a {
+ color:#7fc241 !important
+ }
+ #navbar .menuextraslanguages li.active a,#navbar .menuextraslanguages li a:hover {
+ border-color:#7fc241 !important
+ }
+ #navbar .container {
+ padding:0
+ }
+ #navbar .navbar-toggle {
+ display:block
+ }
+ #navbar .navbar-oneQt,#navbar.fixed .navbar-oneQt,#navbar .navbar-oneQt:hover {
+ margin-left:0;
+ height:26px;
+ width:22px;
+ padding:7px 20px 7px 15px
+ }
+ #navbar .navbar-oneQt:before {
+ left:20px
+ }
+ #navbar .navbar-menu {
+ max-height:0;
+ overflow:hidden;
+ width:100%;
+ border-top:1px solid #eee;
+ -webkit-transition:all 600ms ease-in-out;
+ -moz-transition:all 600ms ease-in-out;
+ -o-transition:all 600ms ease-in-out;
+ transition:all 600ms ease-in-out;
+ position:relative
+ }
+ #mainmenu {
+ float:none;
+ width:100%;
+ padding:0;
+ margin:0
+ }
+ #mainmenu li {
+ float:none;
+ list-style:none
+ }
+ #mainmenu li:nth-child(odd) {
+ background:rgba(0,0,0,0)
+ }
+ #mainmenu li a,#navbar.fixed #mainmenu li a {
+ padding:10px;
+ border-left:3px solid #fff;
+ height:auto;
+ width:100%
+ }
+ #mainmenu li.current-menu-item a,#navbar.fixed #mainmenu li.current-menu-item a {
+ border-bottom:none;
+ border-left:3px solid #5caa15;
+ padding:10px
+ }
+ #mainmenu li a:hover {
+ border-bottom:0;
+ padding:10px;
+ border-left:3px solid #5caa15
+ }
+ #navbar.fixed {
+ -moz-box-shadow:0px 0px 0px rgba(0,0,0,0);
+ -webkit-box-shadow:0px 0px 0px rgba(0,0,0,0);
+ box-shadow:0px 0px 0px rgba(0,0,0,0)
+ }
+ .lt-ie9 #navbar.fixed {
+ border-bottom:none
+ }
+ #menuextras li.navbar-search {
+ padding:5px 0
+ }
+ .container {
+ padding:0 2%
+ }
+ body .main {
+ margin-top:0px
+ }
}
-
-li {
- margin-bottom: 10px;
- padding-left: 8px;
- list-style: outside;
- list-style-type: square;
- text-align: left;
+.in-page-nav {
+ width:100%;
+ background:#eeeeee
}
-
-ol {
- margin: 10px;
- padding: 0;
+.in-page-nav ul {
+ margin:0 auto;
+ letter-spacing:-0.31em;
+ max-width:1180px;
+ text-align:center
}
-
- ol > li {
- margin-left: 30px;
- padding-left: 8px;
- list-style: decimal;
- }
-
-.centerAlign {
- text-align: left
+.in-page-nav ul li {
+ display:inline-block;
+ letter-spacing:normal
}
-
-.cpp {
- display: block;
- margin: 10px;
- overflow: auto;
- padding: 20px 20px 20px 20px;
+.in-page-nav ul li a {
+ color:#26282a;
+ padding:25px 10px;
+ display:inline-block
}
-
-.js {
- display: block;
- margin: 10px;
- overflow: auto;
- padding: 20px 20px 20px 20px;
+body.qt-account #navbar .navbar-oneQt {
+ width:auto;
+ height:auto
}
-
-.footerNavi {
- width: auto;
- text-align: right;
- margin-top: 50px;
- z-index: 1;
+body.qt-account #navbar .navbar-oneQt:before {
+ left:0;
+ position:relative;
+ display:inline-block;
+ vertical-align:middle;
+ top:0;
+ margin-right:20px
}
-
-.memItemLeft {
- padding-right: 3px
+body.qt-account #navbar .navbar-oneQt h2 {
+ margin:0;
+ color:#000;
+ display:inline-block;
+ vertical-align:middle
}
-
-.memItemRight {
- padding: 3px 15px 3px 0
+.landing header[role="banner"] {
+ background:#26282a
}
-
-.qml {
- display: block;
- margin: 10px;
- overflow: auto;
- padding: 20px 20px 20px 20px;
+.landing header[role="banner"] figure {
+ max-width:1180px;
+ margin:auto;
+ position:relative
}
-
-.qmldefault {
- padding-left: 5px;
- float: right;
- color: red;
+.landing header[role="banner"] figure img {
+ max-width:100%
}
-
-.qmlreadonly {
- padding-left: 5px;
- float: right;
- color: #254117;
+.landing header[role="banner"] figcaption {
+ color:#fff;
+ position:absolute;
+ left:0px;
+ width:100%;
+ text-align:center
}
-
-.rightAlign {
- padding: 3px 5px 3px 10px;
- text-align: right;
+.landing header[role="banner"] figcaption.top {
+ top:0
}
-
-.qmldoc {
- margin-left: 15px
+.landing header[role="banner"] figcaption.bottom {
+ bottom:0
}
-
-/*
------------
-Content table
------------
-*/
-
-@media print {
- .toc {
- float: right;
- clear: right;
- padding-bottom: 10px;
- padding-top: 50px;
- width: 100%;
- background-image: url('../images/bgrContent.png');
- background-position: top;
- background-repeat: no-repeat;
- }
+.landing header[role="banner"] figcaption h1 {
+ margin:50px auto 0 auto;
+ max-width:70%;
+ font-weight:600
}
-
-@media screen {
- .toc {
- clear: both;
- clear: right;
- position: relative;
- top: 83px;
- float: right;
- vertical-align: top;
- -moz-border-radius: 7px 7px 7px 7px;
- -webkit-border-radius: 7px 7px 7px 7px;
- border-radius: 7px 7px 7px 7px;
- background: #FFF url('../images/bgrContent.png');
- background-position: top;
- background-repeat: repeat-x;
- border: 1px solid #E6E6E6;
- padding-left: 5px;
- padding-bottom: 10px;
- height: auto;
- width: 200px;
- text-align: left;
- margin-left: 20px;
- }
+.landing header[role="banner"] figcaption h3 {
+ margin-bottom:40px
}
-
-.toc h3 {
- text-decoration: none
+.cookies_yum {
+ background-color:#006325;
+ display:none;
+ width:100%
}
-
-.toc h3 {
- font: 500 14px/1.2 Arial;
- font-weight: 100;
- padding: 0px;
- margin: 0px;
- padding-top: 5px;
- padding-left: 5px;
+.cookies_yum img {
+ width:25px;
+ top:6px;
+ display:inline-block;
+ position:absolute;
+ left:6px
}
-
-.toc ul {
- padding-left: 10px;
- padding-right: 5px;
- padding-top: 10px;
+.cookies_yum div {
+ margin:0 auto;
+ max-width:1180px;
+ min-height:30px;
+ padding:6px 0px 6px 0px;
+ position:relative
}
-
-.toc ul li {
- margin-left: 15px;
- list-style-image: url('../images/blu_dot.png');
- list-style: outside;
- marker-offset: 0px;
- margin-bottom: 8px;
- padding-left: 0px;
- }
-
-.toc .level1 {
- border: none
+.cookies_yum p {
+ color:white;
+ margin:0px;
+ font-size:0.79em;
+ display:inline-block;
+ line-height:1.2;
+ padding:0 30px 0 40px
}
-
-.toc .level2 {
- border: none;
- margin-left: 25px;
+.cookies_yum p a {
+ white-space:nowrap
}
-
-.level3 {
- border: none;
- margin-left: 30px;
+.cookies_yum a:hover {
+ color:white
+}
+.cookies_yum .close {
+ width:15px;
+ height:15px;
+ background-image:url("../images/cookiebar-x.png");
+ background-size:15px 30px;
+ background-position:top left;
+ cursor:pointer;
+ top:6px;
+ right:6px;
+ position:absolute
+}
+.cookies_yum .close:hover {
+ background-position:bottom left
+}
+#bottom_header {
+ display:block;
+ position:absolute;
+ width:100%;
+ z-index:50;
+ padding-top:15px
+}
+#bottom_header .container {
+ overflow:visible
+}
+#bottom_header .left {
+ font-weight:bolder
+}
+#bottom_header a {
+ color:white;
+ transition-duration:0.3s
+}
+#bottom_header .left a:hover {
+ padding-left:10px
+}
+.fixed .menuextraslanguages {
+ opacity:0;
+ visibility:hidden
+}
+@media (max-width: 1120px) {
+ .fixed .menuextraslanguages {
+ opacity:1 !important;
+ visibility:visible !important
+ }
+}
+#navbar .menuextraslanguages {
+ position:absolute;
+ right:0;
+ bottom:-35px;
+ transition:all 0.2s ease-in-out;
+ -webkit-transition:all 0.2s ease-in-out;
+ -moz-transition:all 0.2s ease-in-out;
+ -ms-transition:all 0.2s ease-in-out;
+ -o-transition:all 0.2s ease-in-out
+}
+#navbar .menuextraslanguages li {
+ display:inline;
+ list-style:none;
+ margin-left:3px;
+ padding:0px 4px;
+ font-size:0.6875em
+}
+#navbar .menuextraslanguages li.dark a {
+ color:#868482
+}
+#navbar .menuextraslanguages li.dark a:hover {
+ border:2px solid #868482
+}
+#navbar .menuextraslanguages li.active.dark a {
+ border-color:#868482;
+ color:#868482
+}
+#navbar .menuextraslanguages a {
+ color:#fff;
+ padding:2px 4px;
+ border:2px solid transparent
+}
+#navbar .menuextraslanguages a:hover,#navbar .menuextraslanguages li.active a {
+ border:2px solid #fff;
+ color:#fff
+}
+#bottom_header .dark,#bottom_header .dark.active {
+ color:#868482;
+ transition-duration:0.3s;
+ border-color:#868482 !important
+}
+#navbar .big_bar {
+ width:100%;
+ height:100px;
+ background-color:#80C342;
+ display:none;
+ position:relative
+}
+#navbar .big_bar.search {
+ height:auto;
+ overflow:hidden;
+ display:none
+}
+#navbar .big_bar ::-webkit-input-placeholder {
+ color:#fff
+}
+#navbar .big_bar :-moz-input-placeholder {
+ color:#fff
+}
+#navbar .big_bar ::-moz-input-placeholder {
+ color:#fff
+}
+#navbar .big_bar :-ms-input-placeholder {
+ color:#fff
+}
+#navbar .big_bar:hover>div .big_bar_button.account {
+ background-position:right bottom
+}
+#navbar .big_bar.account h1 {
+ padding-top:20px
+}
+#navbar .big_bar.account h1,#navbar .big_bar.account h1 a {
+ color:#FFF;
+ margin-bottom:5px
+}
+#navbar .big_bar.account h1 a:hover {
+ color:#328930
+}
+#navbar .big_bar_button:hover {
+ background-position:left bottom;
+ cursor:pointer
+}
+#navbar .big_bar_button.account {
+ background-position:right top
+}
+#navbar .big_bar input.big_bar_search {
+ background:none repeat scroll 0 0 transparent;
+ border:medium none;
+ color:#fff;
+ display:block;
+ float:left;
+ font-size:4em;
+ outline:0 none;
+ width:70%;
+ line-height:1.3;
+ height:auto;
+ margin:10px 5%;
+ padding:0;
+ box-sizing:border-box;
+ -webkit-box-sizing:border-box;
+ -moz-box-sizing:border-box;
+ *behavior:url(boxsizing.htc)
+}
+#navbar .big_bar_button {
+ background-color:transparent;
+ border:none;
+ width:18%;
+ transition-duration:0.3s;
+ display:block;
+ float:left;
+ position:relative;
+ font-family:'QT Icons';
+ font-size:3.5em;
+ color:#fff;
+ margin:15px 2% 0 0 !important;
+ text-align:right;
+ padding-right:2px !important;
+ transition:all 0.2s ease-in-out;
+ -webkit-transition:all 0.2s ease-in-out;
+ -moz-transition:all 0.2s ease-in-out;
+ -ms-transition:all 0.2s ease-in-out;
+ -o-transition:all 0.2s ease-in-out
+}
+#navbar .big_bar_button:focus,#navbar .big_bar_button:hover {
+ outline:0;
+ color:#ebebeb
+}
+.hero_slide>div {
+ width:80%;
+ margin:0 auto
+}
+.hero_slide>div:first-child>div {
+ width:80%;
+ margin:0 auto
+}
+.hero_slide .content {
+ margin-top:70px
+}
+.hero_bar {
+ padding-top:50px;
+ padding-bottom:18px
+}
+.hero_bar p {
+ font-size:0.875em;
+ text-align:center
+}
+.hero_bar .arrow {
+ bottom:65px;
+ display:block;
+ margin:0 auto;
+ position:relative;
+ right:260px;
+ width:230px
+}
+.hero_bar .comment {
+ margin:0
+}
+#footerbar {
+ background:#26282a;
+ color:#fff
+}
+#footerbar.fixed {
+ bottom:0;
+ left:0;
+ width:100%
+}
+#footerbar .footer-main .footer-nav {
+ display:inline;
+ float:left
+}
+#footerbar .footer-main .footer-nav li {
+ float:left;
+ margin-right:1em
+}
+#footerbar .footer-main .footer-nav li a {
+ display:block;
+ padding:31px 10px 15px 0;
+ line-height:20px;
+ height:20px;
+ color:#d6d6d6
+}
+#footerbar .footer-main .footer-nav li a:hover,#footerbar .footer-main .footer-nav li.current-menu-item a {
+ color:#eee
+}
+#footerbar .footer-main .footer-nav .sub-menu {
+ margin-left:0;
+ margin-bottom:0
+}
+#footerbar .footer-main .footer-nav .sub-menu li {
+ float:none
+}
+#footerbar .footer-main .footer-nav .sub-menu ul {
+ padding:1px 1em;
+ font-size:0.786em;
+ line-height:8px;
+ float:none;
+ color:#5d5b59;
+ margin-bottom:0
+}
+#footerbar .footer-main .footer-nav .sub-menu li a {
+ padding:1px 0;
+ font-size:0.786em;
+ line-height:8px;
+ float:none;
+ color:#d6d6d6
+}
+#footerbar .footer-main .footer-nav .sub-menu li a:hover,#footerbar .footer-main .footer-nav .sub-menu li.current-menu-item a {
+ color:#eee
+}
+#footerbar .footer-main .footer-logo {
+ display:inline;
+ float:right;
+ padding:29px 0 28px 10px;
+ margin-left:30px;
+ width:56px
+}
+#footerbar .footer-main .footer-logo:before {
+ content:attr(data-icon);
+ font-family:'Qt Icons';
+ width:100%;
+ line-height:1.2;
+ display:inline-block;
+ font-size:1.875em;
+ color:#706e6d
+}
+#footerbar .footer-main .footer-logo:hover {
+ padding:31px 0 26px 10px
+}
+#footerbar .footer-main .footer-social {
+ display:inline;
+ float:right;
+ padding-top:31px
+}
+#footerbar .footer-main .footer-social>div {
+ margin-left:0.1em;
+ margin-bottom:10px
+}
+#footerbar .disclaimer {
+ font-size:0.786em;
+ line-height:2.73;
+ color:#868584;
+ padding-top:20px;
+ padding-bottom:0.5%
+}
+#footerbar .disclaimer a {
+ color:#bdbebf
+}
+#footerbar .disclaimer a:hover {
+ color:#d6d6d6
+}
+#footerbar .disclaimer ul li {
+ float:left;
+ vertical-align:middle;
+ margin-left:1.18em
+}
+#footerbar .disclaimer ul li:first-child {
+ margin-left:0
+}
+#footerbar .disclaimer ul.lang-selector a {
+ color:#506a34;
+ color:rgba(128,195,66,0.3)
+}
+#footerbar .disclaimer ul.lang-selector a:hover {
+ color:#80c342;
+ color:rgba(128,195,66,0.7)
+}
+#menu-footer-menu, #menu-footer-menu ul {
+ margin-left:0;
+ margin-bottom:0
+}
+@font-face {
+ font-family:'Open Sans';
+ font-style:normal;
+ font-weight:300;
+ src:local("Open Sans Light"),local("OpenSans-Light"),url(//fonts.gstatic.com/s/opensans/v10/DXI1ORHCpsQm3Vp6mXoaTYnF5uFdDttMLvmWuJdhhgs.ttf) format("truetype")
+}
+@font-face {
+ font-family:'Open Sans';
+ font-style:normal;
+ font-weight:400;
+ src:local("Open Sans"),local("OpenSans"),url(//fonts.gstatic.com/s/opensans/v10/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf) format("truetype")
+}
+@font-face {
+ font-family:'Open Sans';
+ font-style:normal;
+ font-weight:600;
+ src:local("Open Sans Semibold"),local("OpenSans-Semibold"),url(//fonts.gstatic.com/s/opensans/v10/MTP_ySUJH_bn48VBG8sNSonF5uFdDttMLvmWuJdhhgs.ttf) format("truetype")
+}
+@font-face {
+ font-family:'Open Sans';
+ font-style:normal;
+ font-weight:700;
+ src:local("Open Sans Bold"),local("OpenSans-Bold"),url(//fonts.gstatic.com/s/opensans/v10/k3k702ZOKiLJc3WVjuplzInF5uFdDttMLvmWuJdhhgs.ttf) format("truetype")
+}
+@font-face {
+ font-family:'Open Sans';
+ font-style:normal;
+ font-weight:800;
+ src:local("Open Sans Extrabold"),local("OpenSans-Extrabold"),url(//fonts.gstatic.com/s/opensans/v10/EInbV5DfGHOiMmvb1Xr-honF5uFdDttMLvmWuJdhhgs.ttf) format("truetype")
+}
+@font-face {
+ font-family:'Droid Sans Mono';
+ font-style:normal;
+ font-weight:400;
+ src:local("Droid Sans Mono"),local("DroidSansMono"),url(//fonts.gstatic.com/s/droidsansmono/v7/ns-m2xQYezAtqh7ai59hJUYuTAAIFFn5GTWtryCmBQ4.woff) format("woff")
+}
+@font-face {
+ font-family:'Qt Icons';
+ src:url("../style/icomoon.eot?-tgjuoj");
+ src:url("../style/icomoon.eot?#iefix-tgjuoj") format("embedded-opentype"),url("../style/icomoon.woff?-tgjuoj") format("woff"),url("../style/icomoon.ttf?-tgjuoj") format("truetype"),url("../style/icomoon.svg?-tgjuoj#icomoon") format("svg");
+ font-weight:normal;
+ font-style:normal
+}
+.clearfix:before,.clearfix:after {
+ content:" ";
+ display:table
+}
+.clearfix:after {
+ clear:both
}
-
.clearfix {
- clear: both
+ *zoom:1
}
-
-/* start index box */
-
-.indexbox {
- width: 100%;
- display: inline-block;
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video {
+ margin:0;
+ padding:0;
+ border:0;
+ font-size:100%
}
-
-.indexbox .indexIcon {
- width: 11%
- }
-
- .indexbox .indexIcon span {
- display: block
- }
-
-.indexboxcont {
- display: block
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,caption,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video {
+ vertical-align:baseline
}
-
-.indexboxcont .sectionlist {
- display: inline-block;
- vertical-align: top;
- width: 32.5%;
- padding: 0;
- }
-
- .indexboxcont .sectionlist ul {
- margin-bottom: 20px
- }
-
- .indexboxcont .sectionlist ul li {
- line-height: 1.5
- }
-
-.indexboxcont .indexIcon {
- width: 11%;
- *width: 18%;
- _width: 18%;
- overflow: hidden;
- }
-
-.indexboxcont .section {
- float: left
- }
-
-.indexboxcont .section {
- display: inline-block;
- width: 49%;
- *width: 42%;
- _width: 42%;
- padding: 0 2% 0 1%;
- vertical-align: top;
- }
-
- .indexboxcont .section p {
- padding-top: 20px;
- padding-bottom: 20px;
- }
-
-.indexboxcont:after {
- content: ".";
- display: block;
- height: 0;
- clear: both;
- visibility: hidden;
-}
-
-/*
------------
-Landing page
------------
-*/
-
-.col-group {
- white-space: nowrap;
- vertical-align: top;
-}
-
-.col-1 {
- display: inline-block;
- white-space: normal;
- width: 70%;
- height: 100%;
- float: left;
-}
-
-.col-1 h1 {
- margin: 20px 0 0 0
- }
-
-.col-2 {
- display: inline-block;
- white-space: normal;
- width: 25%;
- margin: 0 0 0 50px;
-}
-
-.sectionlist {
- width: 100% !important
-}
-
-/*
-Additions from Qt Project
-*/
-
body {
- background: #E8E8E8;
- margin: 0px;
- font-family: "Open Sans",sans-serif !important;
+ font-family:“Open Sans”, Arial, Helvetica, sans-serif;
+ line-height:1.5;
+ font-weight:300
}
-
-.qt13a-twoCol {
- width: 23.46939%;
- float: left;
- margin-right: 2.04082%;
- display: inline;
+h1,h2,h3,h4,h5,h6 {
+ font-weight:300
}
-
-.qt13a-fourCol {
- width: 48.97959%;
- float: left;
- margin-right: 2.04082%;
- display: inline;
+.context h2,.context h3,.context h4,.context h5,.context h6 {
+ margin:1.5em 0 1em
}
-
-.qt13a-sixCol {
- width: 70.4898%;
- float: left;
- margin-right: 2.04082%;
- display: inline;
+.context h1 {
+ margin-bottom:1em;
+ font-size:3.125em
}
-
-.qt13a-eightCol {
- width: 100%;
- float: left;
- margin-right: 2.04082%;
- display: inline;
+.context h3.fn,.context h3.flags {
+ color:#26282a;
+ font-size:1.46em;
+ padding:15px 0 15px 0;
+ border-bottom:2px #eee solid;
+ word-wrap:break-word
}
-
-.qt13a-fiveCol {
- width: 17.35537%;
- float: left;
- margin-right: 3.30579%;
- display: inline;
+.context h3.fn .name,
+.context h3 span.type,
+.qmlname span.name {
+ font-weight: 400
}
-
-.qt13a-fiveCol:nth-child(2n) {
- float: left;
- margin-right: 3.30579%;
+.qmlname {
+ font-size:1.46em
}
-
-.qt13a-omega {
- float: right;
- margin-right: 0;
- *margin-left: -20px;
- display: inline;
+.qmlproto table {
+ border:none;
+ border-bottom:2px #eee solid
}
-
-.qt13a-last {
- float: right;
- margin-right: 0;
- *margin-left: -20px;
- display: inline;
+.qmlproto table p {
+ max-width:100%
}
-
-.qt13a-container {
- *zoom: 1;
- padding-left: 20px;
- padding-right: 20px;
- margin-left: auto;
- margin-right: auto;
- max-width: 1045px;
+.qmlproto table tr {
+ background-color:#fff
}
-
-.qt13a-container:after {
- content: "";
- display: table;
- clear: both;
+.qmlname td, .qmlname th {
+ border:none;
+ text-align:left;
+ padding:5px 0 0 0
}
-
-.qt13a-container.qt13a-dynamic {
- max-width: 1295px
+.qmlreadonly,.qmldefault {
+ padding:0 5px 0 5px;
+ font-size:0.75em;
+ background-color:#eee;
+ float:right
}
-
-.qt13a-no-bg-img {
- background-image: none !important
+.qmlreadonly {
+ color:#414141
}
-
-.qt13a-wrapper {
- overflow: hidden
+.qmldefault {
+ color:#D14141
}
-
-.content-view {
- position: relative;
- overflow: hidden;
+.rightAlign {
+ padding:3px 5px 3px 10px;
+ text-align:right
}
-
-#qt13a-header {
- background: url('../images/Qt-header-bg.jpg') repeat;
- min-height: 126px;
- padding: 0;
- margin: 0;
- min-width: 1045px;
- margin-bottom: 18px;
+article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section {
+ display:block
}
-
- #qt13a-header .qt13a-nav-divider-left {
- border-left: 1px solid #35322f;
- padding-left: 10px;
- margin-left: 5px;
- font-size: 13px;
- }
-
- #qt13a-header #qt13a-title_nav {
- padding-top: 34px;
- width: 87.37374%;
- float: left;
- margin-right: 1.0101%;
- display: inline;
- float: right;
- margin-right: 0;
- *margin-left: -20px;
- display: inline;
- }
-
- #qt13a-header .qt13a-gradient {
- background: url('../images/Qt-gradient.png') repeat-x;
- background-position: bottom;
- margin: 0;
- min-height: 126px;
- padding: 0;
- }
-
- #qt13a-header p.qt13a-title {
- font-size: 24px;
- margin: 0 0 0 0px;
- letter-spacing: -1px;
- color: #35322f;
- font-weight: 600;
- }
-
- #qt13a-header p.qt13a-title a {
- font-weight: 600;
- color: #35322f;
- }
-
- #qt13a-header p.qt13a-title a:hover {
- color: #35322f;
- text-decoration: none;
- }
-
- #qt13a-header #qt13a-title {
- padding: 0px 0 0 0px;
- padding-bottom: 0px;
- }
-
- #qt13a-header #qt13a-logo {
- float: left;
- width: 11.61616%;
- float: left;
- margin-right: 1.0101%;
- display: inline;
- margin: 20px 0px 10px 0;
- min-width: 50px;
- }
-
- #qt13a-header #qt13a-logo .qt13a-site-logo {
- background: url('../images/Qt-logo.png') no-repeat;
- text-indent: -100em;
- overflow: hidden;
- display: block;
- height: 90px;
- -moz-box-shadow: none;
- -webkit-box-shadow: none;
- box-shadow: none;
- }
-
- #qt13a-header #qt13a-logo img {
- float: left;
- border: 0;
- -moz-box-shadow: none;
- -webkit-box-shadow: none;
- box-shadow: none;
- }
-
- #qt13a-header .qt13a-nav {
- background: none
- }
-
- #qt13a-header .qt13a-nav .qt13a-nav-divider-left {
- border-left: 1px solid #35322f;
- padding-left: 20px;
- }
-
- #qt13a-header .qt13a-nav .qt13a-nav-small a {
- font-size: 13px
- }
-
- #qt13a-header .qt13a-nav ul {
- margin: 0 0 0 0px;
- padding: 11px 0 0;
- background: none;
- }
-
- #qt13a-header .qt13a-nav ul li.devnet-active a {
- color: #fff
- }
-
- #qt13a-header .qt13a-nav ul li {
- display: inline-block;
- width: auto;
- padding: 0 2.88% 0 0;
- margin: 0;
- border: 0;
- *display: inline;
- zoom: 1;
- }
-
- #qt13a-header .qt13a-nav ul li a {
- color: #35322f;
- margin: 0;
- padding: 0;
- line-height: 18px;
- font-size: 18px;
- }
-
- #qt13a-header .qt13a-nav ul li a:hover, #qt13a-header .qt13a-nav ul li a:active, #qt13a-header .qt13a-nav ul li a.active {
- color: #fff;
- text-decoration: none;
- }
-
-#qt13a-register_search {
- display: block;
- font-variant: 400;
- float: right;
+body {
+ line-height:1;
+ font-family:"Open Sans", Arial, Helvetica, sans-serif;
+ transition-duration:1s
}
-
-#qt13a-register {
- padding: 34px 0px 0;
- float: right;
- text-align: right;
- color: #1e1b18;
+ol,ul {
+ list-style:none
}
-
- #qt13a-register .qt13a-link-divider {
- padding: 0 5px
- }
-
- #qt13a-register a {
- color: #1e1b18;
- font-weight: 400;
- font-size: 13px;
- padding-left: 13px;
- }
-
- #qt13a-register a:visited {
- color: #1e1b18
- }
-
- #qt13a-register a:hover {
- color: #fff;
- text-decoration: none;
- }
-
-#search {
- margin-top: 23px
+.context ol,.context ul {
+ margin-top:0.75em;
+ margin-left:20px
}
-
-#qt13a-footer {
- background: url('../images/Qt-header-bg.jpg') repeat;
- margin: 0;
+.mainContent ol>li {
+ list-style-type:decimal
}
-
- #qt13a-footer .qt13a-container {
- padding: 36px 0
- }
-
- #qt13a-footer .qt13a-gradient {
- background: url('../images/Qt-dark_gradient.png') repeat-x;
- background-position: bottom;
- margin: 0;
- min-height: 126px;
- padding: 0;
- }
-
- #qt13a-footer .qt13a-shadow {
- background: transparent url('../images/Qt-footer_shadow.png') repeat-x top center
- }
-
- #qt13a-footer .qt13a-last {
- float: right;
- margin-right: 0;
- *margin-left: -20px;
- display: inline;
- }
-
- #qt13a-footer ul {
- width: 17.35537%;
- float: left;
- margin-right: 3.30579%;
- display: inline;
- padding-left: 0;
- list-style-type: none;
- }
-
- #qt13a-footer ul li a.qt13a-some-icon {
- width: 32px;
- height: 32px;
- background-repeat: none;
- text-indent: -300em;
- overflow: hidden;
- display: -moz-inline-stack;
- display: inline-block;
- vertical-align: middle;
- *vertical-align: auto;
- zoom: 1;
- *display: inline;
- }
-
- #qt13a-footer ul li a {
- font-family: "Open Sans",sans-serif;
- font-size: 13px;
- color: #35322f;
- padding: 0;
- font-weight: 400;
- }
-
- #qt13a-footer ul li a:hover, #qt13a-footer ul li a:active {
- color: #35322f;
- text-decoration: underline;
- }
-
- #qt13a-footer .qt13a-title a, #qt13a-footer .qt13a-title {
- padding: 18px 0 18px;
- font-weight: 400;
- letter-spacing: -0.5pt;
- color: #35322f;
- font-size: 18px;
- margin: 0;
- }
-
-.qt13a-copyright {
- border-top: 1px solid #000;
- background: url('../images/Qt-footer-bg.jpg') repeat;
- margin: 0;
- padding: 36px 0;
- font-weight: 400;
- font-size: 0.84615em;
- line-height: 1.63636em;
+blockquote,q {
+ quotes:none
}
-
-.qt13a-copyright p {
- padding: 0;
- color: #aeadac;
- font-size: 11px;
- }
-
-.qt13a-copyright a {
- color: #328930
- }
-
-.qt13a-copyright a:visited {
- color: #328930
- }
-
-.searchbox {
- display: block;
- overflow: hidden;
- padding: 0px 35px 0 5px;
+blockquote:before,blockquote:after,q:before,q:after {
+ content:'';
+ content:none;
+ width:100%
}
-
-.content-view {
- position: relative;
- overflow: hidden;
+table {
+ border-collapse:collapse;
+ border-spacing:0;
+ margin-bottom:25px;
+ width:100%
}
-
-p, li, p.forum-overview-title, p.forum-description, p.desc, p.forum-lastpost, div.navigationbars li, div.block-profile div {
- font-size: 13px
-}
-
-p.forum-description.desc {
- font-size: 13px !important
-}
-
-.steps li {
- font-size: 16px
-}
-
-div.license p, div.notes p {
- font-size: 12px !important
-}
-
a {
- color: #44a51c;
- text-decoration: none;
+ color:#5caa15;
+ text-decoration:none;
+ transition-duration:0.3s
}
-
-.wrap {
- padding-left: 30px
-}
-
-a:visited {
- color: #007330;
- text-align: left;
-}
-
a:hover {
- color: #44a51c;
- text-align: left;
+ color:#46a2da
}
-
-a:visited:hover {
- color: #44a51c;
- text-align: left;
+.main,.navbar-header,#footerbar>div {
+ max-width:1500px;
+ width:95%;
+ margin:0 auto
}
-
-a:link {
- color: #007330;
- text-decoration: none;
- text-align: left;
-}
-
.main {
- padding: 0px 30px 30px 30px
+ margin-top:100px
+}
+.main_index {
+ background-color:#fff
+}
+.sectionlist {
+ margin-bottom:2em
+}
+[class*="col-"] {
+ letter-spacing:normal
+}
+.landing,.main_index .row {
+ letter-spacing:-0.31em
+}
+.main_index .row>div {
+ letter-spacing:normal
+}
+.col-1,.context {
+ width:80%;
+ display:inline-block;
+ background-color:#fff;
+ padding:35px;
+ -webkit-box-sizing:border-box;
+ -moz-box-sizing:border-box;
+ -ms-box-sizing:border-box;
+ box-sizing:border-box
+}
+.col-1 h2 {
+ font-size:2.1875em;
+ font-weight:300;
+ line-height:1.1;
+ margin-bottom:0.83em;
+ margin-top:1em
+}
+.icons1of3 img {
+ display:inline-block;
+ float:left;
+ margin-right:0.75em;
+ margin-top:-5px;
+ width:2.75em
+}
+div.multi-column {
+ position:relative
+}
+div.multi-column div {
+ display:-moz-inline-box;
+ display:inline-block;
+ vertical-align:top;
+ margin-top:1em;
+ margin-right:2em;
+ width:16em
+}
+.sidebar {
+ display:block;
+ float:right;
+ -webkit-box-sizing:border-box;
+ -moz-box-sizing:border-box;
+ -ms-box-sizing:border-box;
+ box-sizing:border-box;
+ width:20%;
+ padding-left:30px
+}
+.toc,.sectionlist {
+ padding:35px;
+ background-color:#fff;
+ margin-bottom:2em
+}
+.sidebar-content:empty {
+ display:none;
+ visibility:hidden
+}
+.col-2 h2,.toc h3,.sidebar-content h2,.sidebar-content h3,.sectionlist h2 {
+ font-weight:400;
+ margin-bottom:2em
+}
+.toc h3 a {
+ color:#404244
+}
+.title {
+ font-size:3em;
+ font-weight:300;
+ letter-spacing:-1px;
+ line-height:1.15em;
+ margin-bottom:0.5em;
+ word-wrap:break-word
+}
+.navigationbar,col-1 h2 {
+ font-size:0.75em
+}
+.navigationbar h1 {
+ font-size:3.125em;
+ margin-bottom:1em;
+ margin-top:1em
+}
+.navigationbar li {
+ display:inline-block;
+ margin-right:5px;
+ position:relative;
+ padding-right:10px;
+ color:#585a5c
+}
+.navigationbar li a {
+ color:#58585c
+}
+body {
+ background-color:#eee;
+ color:#404244
+}
+.sectionlist li {
+ margin-bottom:5px
+}
+dd {
+ padding-bottom:0.25em;
+ padding-left:2em
+}
+.col-1 ul {
+ margin-bottom:1.56em
+}
+.mainContent li {
+ margin-bottom:0.8em;
+ line-height:1.25em
+}
+.mainContent p {
+ line-height:1.56em;
+ margin-bottom:1.5em;
+ color:#404244;
+ max-width:85%
+}
+.mainContent b {
+ font-weight:400
+}
+.context ul {
+ margin-bottom:1.5em
+}
+.mainContent ul ul {
+ margin-top:0.5em
+}
+.mainContent .naviNextPrevious {
+ margin-top:25px;
+ max-width:100%
+}
+.naviNextPrevious.headerNavi {
+ display:none
+}
+.nextPage {
+ float:right
+}
+.prevPage:before {
+ content:"< "
+}
+.nextPage:after {
+ content:" >"
+}
+.navigationbar li:after {
+ color:#404244;
+ content:"›";
+ display:inline-block;
+ font-size:1.5em;
+ line-height:1;
+ position:absolute;
+ right:-2px;
+ top:-4px
+}
+.navigationbar ul:last li a {
+ color:#80c342
+}
+.sub-navigation {
+ margin-top:10px
+}
+.navigationbar li:last-child:after,.sub-navigation li:after {
+ content:none
+}
+.navigationbar {
+ margin-bottom:10px
+}
+#buildversion {
+ font-style:italic;
+ font-size:small;
+ float:right
+}
+.copy-notice {
+ width:65%;
+ font-size:0.75em;
+ margin-top:50px;
+ margin-bottom:25px;
+ line-height:1.75em;
+ color:#585a5c
+}
+li a.active {
+ color:#585a5c
+}
+.flowList {
+ padding:25px
+}
+.alphaChar {
+ font-size:2em;
+ position:absolute
+}
+.flowList.odd {
+ background-color:#eee
+}
+.context ul>li,.doc-column ul>li {
+ list-style-image:url("list_arrow.png");
+ margin-left:15px;
+ color:#404244;
+ line-height:1.16em
+}
+.mainContent table p {
+ margin:0px;
+ padding:0px
+}
+.mainContent table p {
+ margin:0px;
+ padding:0px;
+ min-height:2em
+}
+.context h4,.context h3,.context h2 {
+ font-size:2.1875em
+}
+.context p img {
+ margin-top:0.75em;
+ max-width:100%
+}
+.context table {
+ vertical-align:initial
+}
+table .odd {
+ background-color:#eee
+}
+table thead {
+ text-align:left;
+ padding-left:20px
+}
+table,table td,table th {
+ border:1px solid #eee
+}
+table td,table th {
+ padding:5px 20px;
+ line-height:1.3
+}
+table.alignedsummary,table.propsummary {
+ width:initial
+}
+div.main_index .row:first-child {
+ border-bottom:1px solid #eee
+}
+div.main_index .row {
+ position:relative
+}
+div.main_index .row>div {
+ display:inline-block;
+ width:50%;
+ vertical-align:top;
+ padding:50px;
+ -webkit-box-sizing:border-box;
+ -moz-box-sizing:border-box;
+ -ms-box-sizing:border-box;
+ box-sizing:border-box
+}
+div.main_index h2 {
+ font-size:2.1875em;
+ margin-bottom:1em
+}
+#search_bar {
+ width:40%;
+ float:right
+}
+div.main_index .row:after {
+ content:"";
+ position:absolute;
+ top:0;
+ right:50%;
+ height:100%;
+ width:1px;
+ background-color:#eee
+}
+div.table {
+ overflow-x:auto
+}
+p.qt_commercial {
+ border:3px solid #5caa15;
+ margin:0 auto;
+ padding:15px;
+ width:28%;
+ text-align:center;
+ clear:both
+}
+h1.qt_commercial {
+ padding:20px;
+ background-color:#5caa15;
+ display:inline;
+ float:right;
+ font-size:1.25em;
+ line-height:1.25em;
+ height:1.25em;
+ color:#fff
+}
+div.qt_commercial {
+ border-top:5px solid #5caa15;
+ margin-bottom:50px
+}
+pre {
+ background-color:#404244;
+ color:#fff;
+ display:block;
+ font-family:"Droid Sans Mono";
+ line-height:1.5;
+ overflow-x:auto;
+ margin-bottom:25px;
+ overflow-x:auto;
+ padding:25px;
+ margin-top:0.75em
+}
+.copy_text {
+ background-color:#46a2da;
+ color:#fff;
+ border:2px solid #46a2da;
+ padding:10px 16px;
+ margin-left:-10px;
+ margin-top:-50px;
+ position:absolute;
+ opacity:0;
+ cursor:pointer;
+ float:right
+}
+.copy_text:hover {
+ background-color:#fff;
+ color:#46a2da
+}
+code,.codelike {
+ font-family:"Droid Sans Mono"
+}
+h3.fn code {
+ font-size:0.75em;
+ float:right;
+ background-color:#eee;
+ padding:3px;
+ margin: 3px 0 0 20px
+}
+pre:hover>.copy_text {
+ display:inline-block;
+ opacity:1;
+ transition:0.5s ease
+}
+#main_title_bar {
+ letter-spacing:-0.31em
+}
+#main_title_bar .search_bar {
+ letter-spacing:normal;
+ width:50%;
+ display:inline-block;
+ -webkit-box-sizing:border-box;
+ -moz-box-sizing:border-box;
+ -ms-box-sizing:border-box;
+ box-sizing:border-box;
+ vertical-align:middle
+}
+#main_title_bar h1 {
+ letter-spacing:normal;
+ width:50%;
+ display:inline-block;
+ -webkit-box-sizing:border-box;
+ -moz-box-sizing:border-box;
+ -ms-box-sizing:border-box;
+ box-sizing:border-box;
+ vertical-align:middle
+}
+#main_title_bar .search_bar * {
+ letter-spacing:normal;
+ padding:0;
+ margin:0;
+ border:none
+}
+@media (max-width: 980px) {
+ body {
+ font-size:calc-em(14px)
+ }
+ #main_title_bar {
+ letter-spacing:-0.31em;
+ width:100%
+ }
+ #main_title_bar>h1,#main_title_bar .search_bar {
+ display:block;
+ width:100%
+ }
+ #main_title_bar .search_bar {
+ margin-bottom:15px
+ }
+ .main {
+ margin-top:0px
+ }
+ .main_index .row {
+ border:none !important
+ }
+ .title {
+ font-size:1.5em;
+ font-weight:400;
+ word-wrap:break-word
+ }
+ .col-1,.context,.naviNextPrevious,.sidebar {
+ padding:10px
+ }
+ .sidebar {
+ padding-top:0
+ }
+ .search .sidebar {
+ display:none;
+ visibility:hidden
+ }
+ .col-2 h2,.toc h3,.sidebar-content h2,.sidebar-content h3,.sectionlist h2 {
+ text-align:center
+ }
+ div.main_index .row:after {
+ content:none
+ }
+ div.main_index .row>div {
+ display:block !important;
+ width:100%;
+ padding:0;
+ margin:0
+ }
+ .context,.sidebar,.col-1 {
+ width:100%
+ }
+ .main_index h2,h1 {
+ text-align:center
+ }
+ .context h4,.context h3,.context h2 {
+ text-align:center
+ }
+ .sidebar-content,.col-2,.toc {
+ background-color:#fff;
+ margin-bottom:1em;
+ padding:20px
+ }
+ .mainContent p {
+ line-height:1.56em;
+ margin-bottom:1em;
+ max-width:100%
+ }
+ table td,table th {
+ padding:5px 5px
+ }
+}
+[id]:target,[name]:target,[name]:target+* {
+ -webkit-animation:highlighter 3s;
+ animation:highlighter 3s
+}
+@-webkit-keyframes highlighter {
+ 25% {
+ background-color:#46a2da;
+ color:#fff
+ }
+ 75% {
+ background-color:#46a2da;
+ color:#fff
+ }
+}
+@keyframes highlighter {
+ 25% {
+ background-color:#46a2da;
+ color:#fff
+ }
+ 75% {
+ background-color:#46a2da;
+ color:#fff
+ }
+}
+@-webkit-keyframes copypaste {
+ 25% {
+ opacity:1
+ }
+ 100% {
+ border-radius:10px;
+ margin-top:-50px;
+ opacity:1
+ }
+}
+@keyframes copypaste {
+ 25% {
+ opacity:1
+ }
+ 100% {
+ border-radius:10px;
+ margin-top:-50px;
+ opacity:1
+ }
+}
+#footer {
+ clear:both
+}
+.menuextraslanguages {
+ display:none;
+ visibility:hidden
+}
+form.gsc-search-box {
+ font-size: 25px !important;
+ margin-top: 0 !important;
+ margin-right: 0 !important;
+ margin-bottom: 4px !important;
+ margin-left: 0 !important;
+ width: 100% !important;
+}
+table.gsc-search-box {
+ border-style: none !important;
+ border-width: 0 !important;
+ border-spacing: 0 0 !important;
+ width: 100% !important;
+ margin-bottom: 2px !important;
}
-.main-rounded {
- display: inline-block;
- background: none repeat scroll 0% 0% rgb(255,255,255);
- width: 100%;
- border: 1px solid #DADADA;
- border-radius: 10px 10px 10px 10px;
- box-shadow: 0 0 3px #C4C4C4;
- padding-bottom: 30px;
+table.gsc-search-box td {
+ vertical-align: middle !important;
+}
+
+table.gsc-search-box td.gsc-input {
+ padding-right: 0px !important;
+}
+table.gsc-search-box td.gsc-input input {
+ background-position: 15px center !important;
+}
+
+td.gsc-search-button {
+ width: 1% !important;
+}
+
+td.gsc-clear-button {
+ width: 14px !important;
+ visibility:hidden !important;
+ display:none !important;
+}
+table.gsc-branding td,
+table.gsc-branding {
+ margin: 0 0 0 0 !important;
+ padding: 0 0 0 0 !important;
+ border: none !important;
+}
+
+table.gsc-branding {
+ border-style: none !important;
+ border-width: 0 !important;
+ border-spacing: 0 0 !important;
+ width: 100% !important;
+}
+
+.gsc-branding-text {
+ color: #676767 !important;
+}
+
+td.gsc-branding-text {
+ vertical-align: top !important;
+}
+td.gsc-branding-text div.gsc-branding-text {
+ padding-bottom: 2px !important;
+ text-align: right !important;
+ font-size: 11px !important;
+ margin-right: 2px !important;
+}
+
+td.gsc-branding-img {
+ width: 65px !important;
+ vertical-align: bottom !important;
+}
+
+img.gsc-branding-img {
+ padding-top: 1px !important;
+ margin: 0 0 0 0 !important;
+ padding-right: 0 !important;
+ padding-left: 0 !important;
+ padding-bottom: 0 !important;
+ border: none !important;
+ display: inline !important;
+}
+
+input.gsc-search-button {
+ background-color: white !important;
+ height: 35px !important;
+ width: 35px !important;
+ color: transparent !important;
+ background-image: url("doc_search.png") !important;
+ background-size: 25px auto;
+ background-position: 0px 5px;
+ background-repeat: no-repeat;
+ margin-left: -43px !important;
+ overflow: hidden;
+ min-width: 20px !important;
+}
+
+input.gsc-search-button:hover {
+ cursor: pointer;
+}
+
+.gsc-search-box-tools .gsc-clear-button {
+ display: none !important;
+ visibility: none !important;
+}
+
+.gsc-overflow-hidden {
+ overflow: hidden !important;
+}
+
+input.gsc-input {
+ background-color: #fff !important;
+ border: 1px solid #d6d6d6 !important;
+ border-radius: 5px !important;
+ box-sizing: border-box !important;
+ color: #868482 !important;
+ outline: 0 none !important;
+ padding: 9px 10px 10px !important;
+ transition: color 0.5s ease 0s, box-shadow 0.5s ease 0s, background-color 0.5s ease 0s !important;
+}
+
+input {
+ font-family: 'Open Sans', Arial, Helvetica, sans-serif !important;
+ line-height: 1.5 !important;
+ font-weight: 300 !important;
+ vertical-align:middle
+}
+
+input:focus {
+ border-color: #46a2da;
+ box-shadow: 0 0 5px #46a2da;
+ color: #000;
}
diff --git a/qmake/doc/qmake.qdocconf b/qmake/doc/qmake.qdocconf
index bfdf1d17981..1a232379990 100644
--- a/qmake/doc/qmake.qdocconf
+++ b/qmake/doc/qmake.qdocconf
@@ -73,3 +73,5 @@ depends += \
qtx11extras \
qtxml \
qtxmlpatterns
+
+navigation.landingpage = "qmake Manual"
diff --git a/src/corelib/io/qfilesystemwatcher_fsevents.mm b/src/corelib/io/qfilesystemwatcher_fsevents.mm
index eebca1cfb00..90ef7a63360 100644
--- a/src/corelib/io/qfilesystemwatcher_fsevents.mm
+++ b/src/corelib/io/qfilesystemwatcher_fsevents.mm
@@ -518,7 +518,6 @@ bool QFseventsFileSystemWatcherEngine::startStream()
NULL
};
const CFAbsoluteTime latency = .5; // in seconds
- FSEventStreamCreateFlags flags = kFSEventStreamCreateFlagWatchRoot;
// Never start with kFSEventStreamEventIdSinceNow, because this will generate an invalid
// soft-assert in FSEventStreamFlushSync in CarbonCore when no event occurred.
@@ -530,7 +529,7 @@ bool QFseventsFileSystemWatcherEngine::startStream()
reinterpret_cast(pathsToWatch),
lastReceivedEvent,
latency,
- flags);
+ FSEventStreamCreateFlags(0));
if (!stream) {
DEBUG() << "Failed to create stream!";
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
index c5afe8c4d26..3ef8e6c80c4 100644
--- a/src/dbus/dbus.pro
+++ b/src/dbus/dbus.pro
@@ -61,7 +61,8 @@ HEADERS += $$PUB_HEADERS \
qdbusintegrator_p.h \
qdbuspendingcall_p.h \
qdbus_symbols_p.h \
- qdbusintrospection_p.h
+ qdbusintrospection_p.h \
+ dbus_minimal_p.h
SOURCES += qdbusconnection.cpp \
qdbusconnectioninterface.cpp \
qdbuserror.cpp \
diff --git a/src/dbus/dbus_minimal_p.h b/src/dbus/dbus_minimal_p.h
new file mode 100644
index 00000000000..862e8201a19
--- /dev/null
+++ b/src/dbus/dbus_minimal_p.h
@@ -0,0 +1,275 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Intel Corporation
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtDBus module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DBUS_MINIMAL_P_H
+#define DBUS_MINIMAL_P_H
+
+extern "C" {
+
+// Equivalent to dbus-arch-deps.h
+typedef qint64 dbus_int64_t;
+typedef quint64 dbus_uint64_t;
+typedef qint32 dbus_int32_t;
+typedef quint32 dbus_uint32_t;
+typedef qint16 dbus_int16_t;
+typedef quint16 dbus_uint16_t;
+
+// simulate minimum version we support
+#define DBUS_MAJOR_VERSION 1
+#define DBUS_MINOR_VERSION 2
+#define DBUS_VERSION ((1 << 16) | (2 << 8))
+
+// forward declaration to opaque types we use
+struct DBusConnection;
+struct DBusMessage;
+struct DBusPendingCall;
+struct DBusServer;
+struct DBusTimeout;
+struct DBusWatch;
+
+// This file contains constants and typedefs from libdbus-1 headers,
+// which carry the following copyright:
+/*
+ * Copyright (C) 2002, 2003 CodeFactory AB
+ * Copyright (C) 2004, 2005 Red Hat, Inc.
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+/* dbus-types.h */
+typedef dbus_uint32_t dbus_unichar_t;
+typedef dbus_uint32_t dbus_bool_t;
+
+/* dbus-shared.h */
+#define DBUS_SERVICE_DBUS "org.freedesktop.DBus"
+#define DBUS_PATH_DBUS "/org/freedesktop/DBus"
+#define DBUS_INTERFACE_DBUS "org.freedesktop.DBus"
+#define DBUS_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable"
+#define DBUS_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties"
+
+#define DBUS_NAME_FLAG_ALLOW_REPLACEMENT 0x1 /**< Allow another service to become the primary owner if requested */
+#define DBUS_NAME_FLAG_REPLACE_EXISTING 0x2 /**< Request to replace the current primary owner */
+#define DBUS_NAME_FLAG_DO_NOT_QUEUE 0x4 /**< If we can not become the primary owner do not place us in the queue */
+
+#define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER 1 /**< Service has become the primary owner of the requested name */
+#define DBUS_REQUEST_NAME_REPLY_IN_QUEUE 2 /**< Service could not become the primary owner and has been placed in the queue */
+#define DBUS_REQUEST_NAME_REPLY_EXISTS 3 /**< Service is already in the queue */
+#define DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER 4 /**< Service is already the primary owner */
+
+#define DBUS_RELEASE_NAME_REPLY_RELEASED 1 /**< Service was released from the given name */
+#define DBUS_RELEASE_NAME_REPLY_NON_EXISTENT 2 /**< The given name does not exist on the bus */
+#define DBUS_RELEASE_NAME_REPLY_NOT_OWNER 3 /**< Service is not an owner of the given name */
+
+typedef enum
+{
+ DBUS_BUS_SESSION, /**< The login session bus */
+ DBUS_BUS_SYSTEM, /**< The systemwide bus */
+ DBUS_BUS_STARTER /**< The bus that started us, if any */
+} DBusBusType;
+
+typedef enum
+{
+ DBUS_HANDLER_RESULT_HANDLED, /**< Message has had its effect - no need to run more handlers. */
+ DBUS_HANDLER_RESULT_NOT_YET_HANDLED, /**< Message has not had any effect - see if other handlers want it. */
+ DBUS_HANDLER_RESULT_NEED_MEMORY /**< Need more memory in order to return #DBUS_HANDLER_RESULT_HANDLED or #DBUS_HANDLER_RESULT_NOT_YET_HANDLED. Please try again later with more memory. */
+} DBusHandlerResult;
+
+/* dbus-memory.h */
+typedef void (* DBusFreeFunction) (void *memory);
+
+/* dbus-connection.h */
+typedef enum
+{
+ DBUS_WATCH_READABLE = 1 << 0, /**< As in POLLIN */
+ DBUS_WATCH_WRITABLE = 1 << 1, /**< As in POLLOUT */
+ DBUS_WATCH_ERROR = 1 << 2, /**< As in POLLERR (can't watch for
+ * this, but can be present in
+ * current state passed to
+ * dbus_watch_handle()).
+ */
+ DBUS_WATCH_HANGUP = 1 << 3 /**< As in POLLHUP (can't watch for
+ * it, but can be present in current
+ * state passed to
+ * dbus_watch_handle()).
+ */
+ /* Internal to libdbus, there is also _DBUS_WATCH_NVAL in dbus-watch.h */
+} DBusWatchFlags;
+
+typedef enum
+{
+ DBUS_DISPATCH_DATA_REMAINS, /**< There is more data to potentially convert to messages. */
+ DBUS_DISPATCH_COMPLETE, /**< All currently available data has been processed. */
+ DBUS_DISPATCH_NEED_MEMORY /**< More memory is needed to continue. */
+} DBusDispatchStatus;
+
+typedef dbus_bool_t (* DBusAddWatchFunction) (DBusWatch *watch,
+ void *data);
+typedef void (* DBusWatchToggledFunction) (DBusWatch *watch,
+ void *data);
+typedef void (* DBusRemoveWatchFunction) (DBusWatch *watch,
+ void *data);
+typedef dbus_bool_t (* DBusAddTimeoutFunction) (DBusTimeout *timeout,
+ void *data);
+typedef void (* DBusTimeoutToggledFunction) (DBusTimeout *timeout,
+ void *data);
+typedef void (* DBusRemoveTimeoutFunction) (DBusTimeout *timeout,
+ void *data);
+typedef void (* DBusDispatchStatusFunction) (DBusConnection *connection,
+ DBusDispatchStatus new_status,
+ void *data);
+typedef void (* DBusWakeupMainFunction) (void *data);
+typedef void (* DBusPendingCallNotifyFunction) (DBusPendingCall *pending,
+ void *user_data);
+typedef DBusHandlerResult (* DBusHandleMessageFunction) (DBusConnection *connection,
+ DBusMessage *message,
+ void *user_data);
+
+/* dbus-errors.h */
+struct DBusError
+{
+ const char *name; /**< public error name field */
+ const char *message; /**< public error message field */
+
+ unsigned int dummy1 : 1; /**< placeholder */
+ unsigned int dummy2 : 1; /**< placeholder */
+ unsigned int dummy3 : 1; /**< placeholder */
+ unsigned int dummy4 : 1; /**< placeholder */
+ unsigned int dummy5 : 1; /**< placeholder */
+
+ void *padding1; /**< placeholder */
+};
+
+/* dbus-message.h */
+struct DBusMessageIter
+{
+ void *dummy1; /**< Don't use this */
+ void *dummy2; /**< Don't use this */
+ dbus_uint32_t dummy3; /**< Don't use this */
+ int dummy4; /**< Don't use this */
+ int dummy5; /**< Don't use this */
+ int dummy6; /**< Don't use this */
+ int dummy7; /**< Don't use this */
+ int dummy8; /**< Don't use this */
+ int dummy9; /**< Don't use this */
+ int dummy10; /**< Don't use this */
+ int dummy11; /**< Don't use this */
+ int pad1; /**< Don't use this */
+ int pad2; /**< Don't use this */
+ void *pad3; /**< Don't use this */
+};
+
+/* dbus-protocol.h */
+#define DBUS_TYPE_INVALID ((int) '\0')
+#define DBUS_TYPE_INVALID_AS_STRING "\0"
+#define DBUS_TYPE_BYTE ((int) 'y')
+#define DBUS_TYPE_BYTE_AS_STRING "y"
+#define DBUS_TYPE_BOOLEAN ((int) 'b')
+#define DBUS_TYPE_BOOLEAN_AS_STRING "b"
+#define DBUS_TYPE_INT16 ((int) 'n')
+#define DBUS_TYPE_INT16_AS_STRING "n"
+#define DBUS_TYPE_UINT16 ((int) 'q')
+#define DBUS_TYPE_UINT16_AS_STRING "q"
+#define DBUS_TYPE_INT32 ((int) 'i')
+#define DBUS_TYPE_INT32_AS_STRING "i"
+#define DBUS_TYPE_UINT32 ((int) 'u')
+#define DBUS_TYPE_UINT32_AS_STRING "u"
+#define DBUS_TYPE_INT64 ((int) 'x')
+#define DBUS_TYPE_INT64_AS_STRING "x"
+#define DBUS_TYPE_UINT64 ((int) 't')
+#define DBUS_TYPE_UINT64_AS_STRING "t"
+#define DBUS_TYPE_DOUBLE ((int) 'd')
+#define DBUS_TYPE_DOUBLE_AS_STRING "d"
+#define DBUS_TYPE_STRING ((int) 's')
+#define DBUS_TYPE_STRING_AS_STRING "s"
+#define DBUS_TYPE_OBJECT_PATH ((int) 'o')
+#define DBUS_TYPE_OBJECT_PATH_AS_STRING "o"
+#define DBUS_TYPE_SIGNATURE ((int) 'g')
+#define DBUS_TYPE_SIGNATURE_AS_STRING "g"
+#define DBUS_TYPE_UNIX_FD ((int) 'h')
+#define DBUS_TYPE_UNIX_FD_AS_STRING "h"
+#define DBUS_TYPE_ARRAY ((int) 'a')
+#define DBUS_TYPE_ARRAY_AS_STRING "a"
+#define DBUS_TYPE_VARIANT ((int) 'v')
+#define DBUS_TYPE_VARIANT_AS_STRING "v"
+
+#define DBUS_TYPE_STRUCT ((int) 'r')
+#define DBUS_TYPE_STRUCT_AS_STRING "r"
+#define DBUS_TYPE_DICT_ENTRY ((int) 'e')
+#define DBUS_TYPE_DICT_ENTRY_AS_STRING "e"
+
+#define DBUS_STRUCT_BEGIN_CHAR ((int) '(')
+#define DBUS_STRUCT_BEGIN_CHAR_AS_STRING "("
+#define DBUS_STRUCT_END_CHAR ((int) ')')
+#define DBUS_STRUCT_END_CHAR_AS_STRING ")"
+#define DBUS_DICT_ENTRY_BEGIN_CHAR ((int) '{')
+#define DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING "{"
+#define DBUS_DICT_ENTRY_END_CHAR ((int) '}')
+#define DBUS_DICT_ENTRY_END_CHAR_AS_STRING "}"
+
+#define DBUS_MESSAGE_TYPE_INVALID 0
+#define DBUS_MESSAGE_TYPE_METHOD_CALL 1
+#define DBUS_MESSAGE_TYPE_METHOD_RETURN 2
+#define DBUS_MESSAGE_TYPE_ERROR 3
+#define DBUS_MESSAGE_TYPE_SIGNAL 4
+
+#define DBUS_MAXIMUM_NAME_LENGTH 255
+
+#define DBUS_INTROSPECT_1_0_XML_NAMESPACE "http://www.freedesktop.org/standards/dbus"
+#define DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+#define DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"
+#define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "\n"
+
+/* dbus-server.h */
+typedef void (* DBusNewConnectionFunction) (DBusServer *server,
+ DBusConnection *new_connection,
+ void *data);
+
+} // extern "C"
+
+#endif // DBUS_MINIMAL_P_H
+
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
index 71658f84c67..88c51947ed9 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -47,10 +47,15 @@
#define QDBUS_SYMBOLS_P_H
#include
-#include
#ifndef QT_NO_DBUS
+#ifdef QT_LINKED_LIBDBUS
+# include
+#else
+# include "dbus_minimal_p.h"
+#endif
+
QT_BEGIN_NAMESPACE
#if !defined QT_LINKED_LIBDBUS
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp
index 124d9d53f66..6351b8a1e30 100644
--- a/src/gui/opengl/qopenglframebufferobject.cpp
+++ b/src/gui/opengl/qopenglframebufferobject.cpp
@@ -481,11 +481,9 @@ void QOpenGLFramebufferObjectPrivate::init(QOpenGLFramebufferObject *, const QSi
GLenum storageFormat = internal_format;
// ES requires a sized format. The older desktop extension does not. Correct the format on ES.
if (ctx->isOpenGLES() && internal_format == GL_RGBA) {
-#ifdef GL_RGBA8_OES
if (funcs.hasOpenGLExtension(QOpenGLExtensions::Sized8Formats))
- storageFormat = GL_RGBA8_OES;
+ storageFormat = GL_RGBA8;
else
-#endif
storageFormat = GL_RGBA4;
}
diff --git a/src/plugins/platforms/android/qandroidplatformtheme.cpp b/src/plugins/platforms/android/qandroidplatformtheme.cpp
index 8cece443b18..d9f062576be 100644
--- a/src/plugins/platforms/android/qandroidplatformtheme.cpp
+++ b/src/plugins/platforms/android/qandroidplatformtheme.cpp
@@ -278,7 +278,8 @@ static std::shared_ptr loadAndroidStyle(QPalette *defaultPalette)
const int pt = paletteType(key);
if (pt > -1 || !qtClassName.isEmpty()) {
// Extract palette information
- QPalette palette;
+ QPalette palette = *defaultPalette;
+
attributeIterator = item.find(QLatin1String("defaultTextColorPrimary"));
if (attributeIterator != item.constEnd())
palette.setColor(QPalette::WindowText, QRgb(int(attributeIterator.value().toDouble())));
diff --git a/src/plugins/platforms/winrt/qwinrtscreen.cpp b/src/plugins/platforms/winrt/qwinrtscreen.cpp
index fadcd01b066..37a3ff3d63b 100644
--- a/src/plugins/platforms/winrt/qwinrtscreen.cpp
+++ b/src/plugins/platforms/winrt/qwinrtscreen.cpp
@@ -37,6 +37,9 @@
#include
#include
#include
+#ifndef Q_OS_WINPHONE
+#include
+#endif
#include "qwinrtbackingstore.h"
#include "qwinrtinputcontext.h"
@@ -1078,12 +1081,14 @@ HRESULT QWinRTScreen::onSizeChanged(ICoreWindow *, IWindowSizeChangedEventArgs *
d->logicalSize = logicalSize;
if (d->eglDisplay) {
const QRect newGeometry = geometry();
-#ifdef Q_OS_WINPHONE // Resize the EGL window
- const int width = newGeometry.width() * (d->orientation == Qt::InvertedPortraitOrientation || d->orientation == Qt::LandscapeOrientation ? -1 : 1);
- const int height = newGeometry.height() * (d->orientation == Qt::InvertedPortraitOrientation || d->orientation == Qt::InvertedLandscapeOrientation ? -1 : 1);
+ int width = newGeometry.width();
+ int height = newGeometry.height();
+#ifdef Q_OS_WINPHONE // Windows Phone can pass in a negative size to provide orientation information
+ width *= (d->orientation == Qt::InvertedPortraitOrientation || d->orientation == Qt::LandscapeOrientation) ? -1 : 1;
+ height *= (d->orientation == Qt::InvertedPortraitOrientation || d->orientation == Qt::InvertedLandscapeOrientation) ? -1 : 1;
+#endif
eglSurfaceAttrib(d->eglDisplay, d->eglSurface, EGL_WIDTH, width);
eglSurfaceAttrib(d->eglDisplay, d->eglSurface, EGL_HEIGHT, height);
-#endif
QWindowSystemInterface::handleScreenGeometryChange(screen(), newGeometry, newGeometry);
QPlatformScreen::resizeMaximizedWindows();
handleExpose();
@@ -1113,6 +1118,16 @@ HRESULT QWinRTScreen::onActivated(ICoreWindow *, IWindowActivatedEventArgs *args
HRESULT QWinRTScreen::onSuspended(IInspectable *, ISuspendingEventArgs *)
{
+#ifndef Q_OS_WINPHONE
+ Q_D(QWinRTScreen);
+ ComPtr d3dDevice;
+ const EGLBoolean ok = eglQuerySurfacePointerANGLE(d->eglDisplay, EGL_NO_SURFACE, EGL_DEVICE_EXT, (void **)d3dDevice.GetAddressOf());
+ if (ok && d3dDevice) {
+ ComPtr dxgiDevice;
+ if (SUCCEEDED(d3dDevice.As(&dxgiDevice)))
+ dxgiDevice->Trim();
+ }
+#endif
QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationSuspended);
QWindowSystemInterface::flushWindowSystemEvents();
return S_OK;
diff --git a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
index 6372fbb0e27..972205566a2 100644
--- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
+++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
@@ -33,14 +33,16 @@
#include
#include
#include
-#include
-#include
#include "common.h"
#include
#include
+#define QT_LINKED_LIBDBUS
+#include
+#include
+
static const char serviceName[] = "org.qtproject.autotests.qpong";
static const char objectPath[] = "/org/qtproject/qpong";
static const char *interfaceName = serviceName;
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index fac16ff8a35..46b33e5d399 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -233,17 +233,11 @@ void tst_QWindow::resizeEventAfterResize()
void tst_QWindow::positioning_data()
{
QTest::addColumn("windowflags");
- QTest::addColumn("resizecount");
- QTest::newRow("default") << int(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint | Qt::WindowFullscreenButtonHint)
-#if defined(Q_OS_OSX) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
- << 4;
-#else
- << 3;
-#endif
+ QTest::newRow("default") << int(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint | Qt::WindowFullscreenButtonHint);
#ifdef Q_OS_OSX
- QTest::newRow("fake") << int(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint) << 4;
+ QTest::newRow("fake") << int(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
#endif
}
@@ -262,7 +256,6 @@ void tst_QWindow::positioning()
const QRect geometry(m_availableTopLeft + QPoint(80, 80), m_testWindowSize);
QFETCH(int, windowflags);
- QFETCH(int, resizecount);
Window window((Qt::WindowFlags)windowflags);
window.setGeometry(QRect(m_availableTopLeft + QPoint(20, 20), m_testWindowSize));
window.setFramePosition(m_availableTopLeft + QPoint(40, 40)); // Move window around before show, size must not change.
@@ -273,8 +266,7 @@ void tst_QWindow::positioning()
window.showNormal();
QCoreApplication::processEvents();
- QTRY_COMPARE(window.received(QEvent::Resize), 1);
- QTRY_VERIFY(window.received(QEvent::Expose) > 0);
+ QTest::qWaitForWindowExposed(&window);
QMargins originalMargins = window.frameMargins();
@@ -284,25 +276,22 @@ void tst_QWindow::positioning()
QPoint originalPos = window.position();
QPoint originalFramePos = window.framePosition();
+ window.reset();
window.setWindowState(Qt::WindowFullScreen);
QCoreApplication::processEvents();
-#if defined(Q_OS_BLACKBERRY) // "window" is the "root" window and will always be shown fullscreen
- // so we only expect one resize event
- Q_UNUSED(resizecount);
- QTRY_COMPARE(window.received(QEvent::Resize), 1);
-#else
- QTRY_COMPARE(window.received(QEvent::Resize), 2);
+ // On BB10 the window is the root window and fullscreen, so nothing is resized.
+#if !defined(Q_OS_BLACKBERRY)
+ QTRY_VERIFY(window.received(QEvent::Resize) > 0);
#endif
QTest::qWait(2000);
+ window.reset();
window.setWindowState(Qt::WindowNoState);
QCoreApplication::processEvents();
-#if defined(Q_OS_BLACKBERRY) // "window" is the "root" window and will always be shown fullscreen
- // so we only expect one resize event
- QTRY_COMPARE(window.received(QEvent::Resize), 1);
-#else
- QTRY_COMPARE(window.received(QEvent::Resize), resizecount);
+ // On BB10 the window is the root window and fullscreen, so nothing is resized.
+#if !defined(Q_OS_BLACKBERRY)
+ QTRY_VERIFY(window.received(QEvent::Resize) > 0);
#endif
QTRY_COMPARE(originalPos, window.position());
\n"
diff --git a/doc/global/includes-online/search.qdoc b/doc/global/includes-online/search.qdoc
new file mode 100644
index 00000000000..25c4563df60
--- /dev/null
+++ b/doc/global/includes-online/search.qdoc
@@ -0,0 +1,39 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page search-results.html
+\title Search Results
+
+\raw HTML
+
+
+
\n"
+
+include(macros.qdocconf)
+include(qt-cpp-defines.qdocconf)
+include(compat.qdocconf)
+#include(manifest-meta.qdocconf)
+include(fileextensions.qdocconf)
+include(qt-html-templates-online.qdocconf)
+
+#extra configuration data DITA information
+include(config.qdocconf)
+
+HTML.prologue = \
+ "Available under certain Qt licenses.
Find out more.
\n" \
+ "
\n" \
+ " C
\n" + +# Turn off single-directory output mode +HTML.nosubdirs = "false" + +# Set navigation homepage +navigation.homepage = "Qt Documentation" + +sourcedirs += includes-online diff --git a/doc/global/qt-module-defaults-online.qdocconf b/doc/global/qt-module-defaults-online.qdocconf index 258295b4f9d..fcff1976d11 100644 --- a/doc/global/qt-module-defaults-online.qdocconf +++ b/doc/global/qt-module-defaults-online.qdocconf @@ -1,7 +1,20 @@ #The online onfiguration for a Qt 5 module, including Add-Ons and Tools. -#Online version contains a different header. #Include this file for a standard Qt 5 module; builds with the online style. +# Start of footer - the rest is defined in qt-html-templates-online.qdocconf +HTML.footer = \ + "\n" \ + " © 2014 Digia Plc and/or its\n" \ + " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " their respective owners. " \ + " The documentation provided herein is licensed under the terms of the" \ + " GNU Free Documentation" \ + " License version 1.3 as published by the Free Software Foundation. " \ + " Digia, Qt and their respective logos are trademarks of Digia Plc " \ + " in Finland and/or other countries worldwide. All other trademarks are property\n" \ + " of their respective owners.
\n" + #include standard set of macros and C++ defines and ignores include(macros.qdocconf) include(qt-cpp-defines.qdocconf) @@ -12,3 +25,7 @@ include(qt-html-templates-online.qdocconf) #extra configuration data DITA information include(config.qdocconf) + +# single-directory output mode +HTML.nosubdirs = "true" +HTML.outputsubdir = "html" diff --git a/doc/global/template/scripts/extras.js b/doc/global/template/scripts/extras.js new file mode 100644 index 00000000000..cb1102d4936 --- /dev/null +++ b/doc/global/template/scripts/extras.js @@ -0,0 +1,23 @@ +var vOffset = 65; + +$(function () { + $('a[href*=#]:not([href=#])').on('click', function () { + var target = $(this.hash); + target = target.length ? target : $('[name=' + this.hash.slice(1) + ']'); + if (target.length) { + setTimeout(function () { + $('html, body').animate({scrollTop: target.offset().top - vOffset}, 50);}, 50); + // return false; + } + }); +}); + +$(window).load(function () { + var h = window.location.hash; + var re = /[^a-z0-9_\#\-]/i + if (h.length > 1 && !re.test(h)) { + setTimeout(function () { + $(window).scrollTop($(h).offset().top - vOffset); + }, 0); + } +}); diff --git a/doc/global/template/scripts/main.js b/doc/global/template/scripts/main.js new file mode 100644 index 00000000000..79de4ea5b2e --- /dev/null +++ b/doc/global/template/scripts/main.js @@ -0,0 +1,241 @@ +"use strict"; + +function createCookie(name, value, days) { + var expires; + if (days) { + var date = new Date(); + date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); + expires = "; expires=" + date.toGMTString(); + } else { + expires = ""; + } + document.cookie = escape(name) + "=" + escape(value) + expires + "; path=/"; + $('.cookies_yum').click(function() { + $(this).fadeOut() + }); +} +function readCookie(name) { + var nameEQ = escape(name) + "="; + 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) return unescape(c.substring(nameEQ.length, c.length)); + } + return null; +} +function eraseCookie(name) { + createCookie(name, "", -1); +} +function load_sdk(s, id, src) { + var js, fjs = document.getElementsByTagName(s)[0]; + if (document.getElementById(id)) return; + js = document.createElement(s); + js.id = id; + js.src = src; + fjs.parentNode.insertBefore(js, fjs); +} +$(document).ready(function($) { + if (document.documentElement.clientWidth < 1220) { + oneQt.extraLinksToMain(); + } + + $('#menuextras .search').click(function(e){ + e.preventDefault(); + $('.big_bar.account').slideUp(); + $('.big_bar.search').slideToggle(); + $('.big_bar_search').focus(); + $(this).toggleClass('open'); + }); + $('.cookies_yum').click(function() { + $('.cookies_yum').fadeOut(); + createCookie("cookies_nom", "yum", 180); + var cookie_added = 1; + }); + if (!(readCookie('cookies_nom') == 'yum')) { + $('.cookies_yum').fadeIn(); + } else { + var cookie_added = 1; + } + + Modernizr.load({test: Modernizr.input.placeholder, + nope: wpThemeFolder + '/js/placeholders.min.js'}); + + $('#navbar .navbar-toggle').click(function(e) { + e.preventDefault(); + if ($(this).hasClass('opened')) { + $(this).removeClass('opened'); + $('#navbar .navbar-menu').css('max-height', '0px'); + } + else { + $(this).addClass('opened'); + $('#navbar .navbar-menu').css('max-height', $('#navbar .navbar-menu ul').outerHeight() + 'px'); + } + }); + + $(window).resize(function() { + oneQt.stickySidebar(); + oneQt.footerPosition(); + if (document.documentElement.clientWidth < 1220) { + oneQt.extraLinksToMain(); + } else { + oneQt.mainLinkstoExtra(); + } + }); + + $(window).scroll(function() { + oneQt.stickySidebar(); + oneQt.stickyHeader(); + }); + + oneQt.stickySidebar(); + oneQt.footerPosition(); + oneQt.tabContents(); +}); + +$( window ).load(function() { + load_sdk('script', 'facebook-jssdk','//connect.facebook.net/en_US/sdk.js#xfbml=1&appId=207346529386114&version=v2.0'); + load_sdk('script', 'twitter-wjs', '//platform.twitter.com/widgets.js'); + $.getScript("//www.google.com/jsapi", function(){ + google.load("feeds", "1", {"callback": oneQt.liveFeeds}); + }); +}); + +var oneQt = { + stickySidebar: function() { + if ($('#sidebar').length && $('#sidebar').outerHeight() > 20) { + var $sidebar = $('#sidebar'); + var $win = $(window); + var $sidebarContainer = $sidebar.parent(); + var headerHeight = $('#navbar').outerHeight(); + if ($win.outerHeight() - headerHeight > $sidebar.innerHeight() && + $win.scrollTop() > $sidebarContainer.offset().top) { + var newTop = headerHeight + $win.scrollTop() - $sidebarContainer.offset().top; + if (newTop + $sidebar.innerHeight() > $sidebarContainer.innerHeight()) + newTop = $sidebarContainer.innerHeight() - $sidebar.innerHeight(); + + $sidebar.css({top: newTop +'px'}) + } + else { + $sidebar.css({top: '0'}) + } + } + }, + + footerPosition: function () { + $('#footerbar').removeClass('fixed'); + if (($('.hbspt-form').length > 0) || ($('#customerInfo').length > 0) || ($('.purchase_bar').length > 0)) { + var footerBottomPos = $('#footerbar').offset().top + $('#footerbar').outerHeight(); + if (footerBottomPos < $(window).height()) + $('#footerbar').addClass('fixed'); + } + }, + + stickyHeader: function () { + var originalHeaderHeight = 79; + if ($(window).scrollTop() > originalHeaderHeight) { + $('#navbar').addClass('fixed'); + $('#bottom_header').fadeOut(); + + if (!(cookie_added == 1)) { + $('.cookies_yum').fadeOut(); + createCookie("cookies_nom", "yum", 180); + var cookie_added = 1; + } + } + else { + $('#navbar').removeClass('fixed'); + $('#bottom_header').fadeIn(); + } + }, + + tabContents: function () { + $('.tab-container').each(function(i) { + var $el = $(this); + $el.find('.tab-titles li:eq(0)').addClass('active'); + $el.find('.tab-contents .tab:eq(0)').addClass('active'); + $el.find('.tab-titles a').click(function(e) { + e.preventDefault(); + var index = $(this).parent().index(); + $el.find('.tab-titles li').removeClass('active'); + $el.find('.tab-contents .tab').removeClass('active'); + $(this).parent().addClass('active'); + $el.find('.tab-contents .tab').eq(index).addClass('active'); + }) + }); + }, + + liveFeeds: function () { + $('.feed-container').each(function(i) { + var feedUrl = $(this).data('url'); + if (feedUrl != "") oneQt.blogFeed($(this), feedUrl); + }); + }, + + blogFeed: function ($container, feedUrl) { + var feed = new google.feeds.Feed(feedUrl); + feed.setNumEntries(3); + feed.load(function(result) { + $container.html(''); + if (!result.error) { + for (var i = 0; i < result.feed.entries.length; i++) { + var entry = result.feed.entries[i]; + var $article = $(''); + $container.append($article); + var html = '';
+ html += ' 
';
+ html += '
';
+ html += ' ';
+ $article.append(html);
+ $article.find('h4 a').text(result.feed.title);
+ $article.find('h3 a').text(entry.title);
+ $article.find('p a').text(entry.author);
+ try {
+ for (var j=0; j';
+ html += '