summaryrefslogtreecommitdiffstats
path: root/src/s60installs
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-02 22:47:27 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-02 22:47:27 (GMT)
commit9a7787d968e56ab52118a7ccdba211cc0fd41d58 (patch)
tree95d32f6fb4fc8dfa94d714026aa694c65488ac15 /src/s60installs
parent30e55019f3ddf9d0df82df68c6324c96904fdc3a (diff)
parent04cdab146c2c1408fa621eb706c9eb01bb425d69 (diff)
downloadQt-9a7787d968e56ab52118a7ccdba211cc0fd41d58.zip
Qt-9a7787d968e56ab52118a7ccdba211cc0fd41d58.tar.gz
Qt-9a7787d968e56ab52118a7ccdba211cc0fd41d58.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: 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 'src/s60installs')
0 files changed, 0 insertions, 0 deletions