diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-10 23:26:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-10 23:26:42 (GMT) |
| commit | c7a18308a2725e4d1763777cb549f1ae74848005 (patch) | |
| tree | 9b5dea983b27fdf9aba5401cf575051d6ecce9b3 /doc/src/index.qdoc | |
| parent | 5a438bd30cf7d92309cbff51da523b7faea335f5 (diff) | |
| parent | 02b0b0af952960f451a3aac570a2df0cc084bce7 (diff) | |
| download | Qt-c7a18308a2725e4d1763777cb549f1ae74848005.zip Qt-c7a18308a2725e4d1763777cb549f1ae74848005.tar.gz Qt-c7a18308a2725e4d1763777cb549f1ae74848005.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: (32 commits)
Fix memory leak in QtScript variable object
doc: Changed some titles so lists of contents sort better.
QSslSocket: fix security vulnerability with wildcard IP addresses
doc: Some reorganization of top page topic hierarchy.
Mac: Fix crash when using style to draw on other things than widgets
Doc: Adding radius support for CSS3 and webkit
Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression
add performance comparisons to qregexp benchmark
configure: fix error message when calling config.status
Fix invalid memory write during recursive timer activation
Added comment about calendarPopup in setCalendarWidget function documentation.
doc: Fixed some qdoc errors.
Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.
CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE.
XmlListModel doc fixes
Mention QML_IMPORT_TRACE in Modules docs
Merge sections about when property and default state
Explain Flipable example further
PathView required some diagonal movement before a drag was initiated.
doc: Fixed some qdoc errors.
...
Diffstat (limited to 'doc/src/index.qdoc')
| -rw-r--r-- | doc/src/index.qdoc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index f890aa6..0609eb8 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -65,10 +65,10 @@ </div> <div class="sectionlist tricol"> <ul> - <!-- <li><a href="qt-basic-concepts.html">Programming with Qt</a></li> --> - <li><a href="qt-basic-concepts.html">Basic Qt Architecture</a></li> - <li><a href="developing-with-qt.html">Cross-platform & Platform-specific Development</a></li> - <li><a href="technology-apis.html">Qt & standard technologies </a></li> + <li><a href="qt-basic-concepts.html">Basic Concepts</a></li> + <li><a href="qt-gui-concepts.html">UI Components</a></li> + <li><a href="developing-with-qt.html">Cross-platform & Platform-specific</a></li> + <li><a href="technology-apis.html">Qt API's for standard technologies </a></li> <li><a href="best-practices.html">Qt How-to's & best practices</a></li> </ul> </div> @@ -77,8 +77,9 @@ <li><a href="declarativeui.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="qt-gui-concepts.html">UI components</a></li> - <!-- <li><a href="declarativeui.html">Qt & GUI design</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> @@ -94,14 +95,14 @@ </div> <div class="section sectionlist"> <ul> - <li><a href="http://doc.qt.nokia.com/qtcreator-2.0/index.html">Qt Creator</a> (online)</li> + <li><a href="http://doc.qt.nokia.com/qtcreator-2.0/index.html">Qt Creator</a></li> <li><a href="designer-manual.html">Qt Designer</a></li> <li><a href="linguist-manual.html">Qt Linguist</a></li> <li><a href="assistant-manual.html">Qt Assistant</a></li> <li><a href="qmake-manual.html">Qt qmake</a></li> - <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/simulator-description.html">Qt Simulator</a> (online)</li> - <li><a href="http://qt.nokia.com/developer/eclipse-integration">Eclipse Integration</a> (online)</li> - <li><a href="http://qt.nokia.com/products/appdev">Add-On Products and Services</a> (online)</li> + <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/simulator-description.html">Qt Simulator</a></li> + <li><a href="http://qt.nokia.com/developer/eclipse-integration">Eclipse Integration</a></li> + <li><a href="http://qt.nokia.com/products/appdev">Add-On Products and Services</a></li> <li><a href="qvfb.html">Virtual Framebuffer</a></li> </ul> </div> |