summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-08-03 08:54:31 (GMT)
committerJesper Thomschutz <jesper.thomschutz@nokia.com>2010-08-10 12:46:01 (GMT)
commite133941d76a2214708b5d7c6aa35eae44d6f5076 (patch)
tree284449b0e0a3f888423f3ed49daa603da1f2469a
parent5aaffb961e0f720abbbf9fc157721fcbfcc9075b (diff)
downloadQt-e133941d76a2214708b5d7c6aa35eae44d6f5076.zip
Qt-e133941d76a2214708b5d7c6aa35eae44d6f5076.tar.gz
Qt-e133941d76a2214708b5d7c6aa35eae44d6f5076.tar.bz2
Doc: Adding content to installation guide and fixing printing bugs
(cherry picked from commit 79797d175c41198b0dffad1dced021a07c5873ae)
-rw-r--r--doc/src/getting-started/installation.qdoc7
-rwxr-xr-xdoc/src/template/style/style.css7
2 files changed, 8 insertions, 6 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 90723ec..629d8b7 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -30,10 +30,13 @@
\title Installation
\brief Installing Qt on supported platforms.
-The installation procedure is different on each Qt platform.
-Please follow the instructions for your platform from the following list.
+The installation procedure is different on each Qt platform. This page provides
+information on how to install Qt, as well as software and hardware requirements
+for using Qt on each of the supported platforms. Please follow the instructions
+for your platform from the following list.
\generatelist{related}
+
*/
/*! \page install-x11.html
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 259591f..9b37693 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -1552,18 +1552,17 @@
@media print
{
- input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft
+ input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult
{
display: none;
background: none;
}
.content
{
- position: absolute;
- top: 0px;
- left: 0px;
background: none;
display: block;
+ width: 100%; margin: 0; float: none;
+
}
}
/* end of print media */