diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-03 06:39:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-03 06:39:37 (GMT) |
| commit | 29ec21be8f69b1275d7945235c15b4ee2750901d (patch) | |
| tree | b20e1f238a96dfc34234ab4d868a905e2735ed2f /doc/src/files-and-resources | |
| parent | 6b2a5c6f18cb766801a50db583e14a8e559e9bfb (diff) | |
| parent | 972191f8e3bdbf702e11be8c0a72fca9e896f395 (diff) | |
| download | Qt-29ec21be8f69b1275d7945235c15b4ee2750901d.zip Qt-29ec21be8f69b1275d7945235c15b4ee2750901d.tar.gz Qt-29ec21be8f69b1275d7945235c15b4ee2750901d.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:
Return 'Unknown' bearer type name for unknown bearer type.
Update def files.
Doc: updating index page, x platform and platform spec. Removing redundant style files
Added notice that some links are online documents.
Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)
configure: don't symlink the mkspecs/features directory
Doc: adding changes to getting started and fixing redirection links
doc: Fixed many qdoc errors.
Fixed potential infinite loop in QFileSystemWatcher on Mac.
qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf
Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.
Simplify network manager settings code.
Use an enum to return the bearer type of a network configuration.
Rename QNetworkConfiguration::bearerName() function.
Diffstat (limited to 'doc/src/files-and-resources')
| -rw-r--r-- | doc/src/files-and-resources/resources.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/files-and-resources/resources.qdoc b/doc/src/files-and-resources/resources.qdoc index b0b0e3c..3177af8 100644 --- a/doc/src/files-and-resources/resources.qdoc +++ b/doc/src/files-and-resources/resources.qdoc @@ -54,7 +54,7 @@ The resource system is based on tight cooperation between \l qmake, \l rcc (Qt's resource compiler), and QFile. It obsoletes Qt 3's \c qembed tool and the - \l{http://qt.nokia.com/doc/qq/qq05-iconography.html#imagestorage}{image + \l{http://doc.qt.nokia.com/qq/qq05-iconography.html}{image collection} mechanism. \section1 Resource Collection Files (\c{.qrc}) |