summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-20 13:11:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-20 13:11:53 (GMT)
commit7c58dbc021e71be80aab66d568d7e4cf4f4ca870 (patch)
tree874706f43bdd6e1f7981ac52656127aa9615dcb6 /doc
parent5b1d33a8e53d74098b6a42775e39cd61cb8001c5 (diff)
parent8aa4ae683c24f46859a0e016809c2de49aead56f (diff)
downloadQt-7c58dbc021e71be80aab66d568d7e4cf4f4ca870.zip
Qt-7c58dbc021e71be80aab66d568d7e4cf4f4ca870.tar.gz
Qt-7c58dbc021e71be80aab66d568d7e4cf4f4ca870.tar.bz2
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: Doc: Changes to the index page and second level pages linking to the index page. Use Ctrl rather than Alt for switching tabs in the demo browser Doc: fixing creator bugs, removing menus and textbox in the header Update Japanese translations Ukrainian translation updated qtconfig and qvfb internationalization fixes add full width characters to ending() in linguist QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filter qdoc: Changed id attribute to be a UUID. just build connman and networkmanager plugins on linux
Diffstat (limited to 'doc')
-rw-r--r--doc/src/frameworks-technologies/model-view-programming.qdoc1
-rw-r--r--doc/src/index.qdoc10
-rw-r--r--doc/src/overviews.qdoc5
-rw-r--r--doc/src/template/style/narrow.css3
-rwxr-xr-xdoc/src/template/style/style.css4
5 files changed, 17 insertions, 6 deletions
diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc
index 7167f97..e230c06 100644
--- a/doc/src/frameworks-technologies/model-view-programming.qdoc
+++ b/doc/src/frameworks-technologies/model-view-programming.qdoc
@@ -27,6 +27,7 @@
/*!
\group model-view
+ \ingroup qt-basic-concepts
\title Model/View Classes
*/
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 2272cf8..95f940d 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -52,7 +52,7 @@
</div>
<div class="indexbox api">
<div class="heading">
- Qt API Overviews</div>
+ Qt API</div>
<div class="indexboxcont indexboxbar ">
<div class="sectionlist tricol">
<ul>
@@ -65,21 +65,19 @@
</div>
<div class="sectionlist tricol">
<ul>
- <li><a href="qt-basic-concepts.html">Basic Concepts</a></li>
+ <li><a href="qt-basic-concepts.html">Programming with Qt</a></li>
<li><a href="qt-gui-concepts.html">GUI Components</a></li>
<li><a href="developing-with-qt.html">Cross-platform and Platform-specific</a></li>
<li><a href="technology-apis.html">Qt APIs for standard technologies </a></li>
<li><a href="best-practices.html">How-To Guides and Best Practices</a></li>
- </ul>
+ <li><a href="qt-gui-concepts.html">Desktop UI components</a></li>
+ </ul>
</div>
<div class="sectionlist">
<ul>
<li><a href="qtquick.html">Qt Quick</a></li>
<li><a href="qdeclarativeintroduction.html">Introduction to QML</a></li>
<li><a href="qdeclarativeelements.html">QML Elements</a></li>
- <li><a href="model-view-programming.html">Model/View Programming</a></li>
- <li><a href="qt-network.html">Network Programming</a></li>
- <li><a href="qt-graphics.html">Graphics and Printing</a></li>
</ul>
</div>
</div>
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index 1c35a63..8e12fd3 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -62,6 +62,7 @@
/*!
\group qt-graphics
+ \ingroup qt-basic-concepts
\title Qt Graphics and Printing
\brief The Qt components for doing graphics.
@@ -71,6 +72,7 @@
/*!
\group qt-network
+ \ingroup qt-basic-concepts
\title Network programming with Qt
\brief The these pages are about Qt's support for network programming.
@@ -91,6 +93,7 @@
/*!
\group qt-activex
\title ActiveX in Qt
+ \ingroup qt-basic-concepts
\ingroup technology-apis
\ingroup platform-specific
@@ -108,6 +111,8 @@
\brief Qt API's for using SQL.
\ingroup technology-apis
\ingroup best-practices
+ \ingroup qt-basic-concepts
+
These pages document Qt's API's for using SQL database systems
in Qt applications.
diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css
index 349048f..de5b0a0 100644
--- a/doc/src/template/style/narrow.css
+++ b/doc/src/template/style/narrow.css
@@ -203,6 +203,9 @@
*border: 1px solid #fff;
*height: 17px;
_height: 18px;
+ /* to be fixed */
+ display: none;
+ /* to be fixed */
}
.narrow .indexbox .indexIcon {
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 6f2bdce..9afff03 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -1521,6 +1521,10 @@
.creator .toc {
margin:10px 20px 10px 10px;
}
+
+ .creator #narrowsearch, .creator #narrowmenu{
+ display:none;
+ }
/* end of creator spec*/
}