summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-08 08:31:27 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-08 08:31:27 (GMT)
commit13017507c92550de7db5f04e205e7e92812d5586 (patch)
tree1e1ea8000d4452f17c151bd245fe99ca65071b40 /qmake
parent4c9e2a4376a52891a21f75e2a441848234ed93c2 (diff)
parentbc29732c7f0a56f0b3413e3eaf487aa56c49f8d6 (diff)
downloadQt-13017507c92550de7db5f04e205e7e92812d5586.zip
Qt-13017507c92550de7db5f04e205e7e92812d5586.tar.gz
Qt-13017507c92550de7db5f04e205e7e92812d5586.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: (38 commits) Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages Doc: correcting broken link to labs Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6 Doc: correcting typo Doc: Fixing bug - line too long and not visible. Breaking the line in two Doc: Fixing typo Doc: Fixing snippet bug. Path pointing to the wrong snippet Doc: Fixed doc references to non-existing API Doc: Fix broken links in QSslConfiguration Added a project file for the Getting Started with QML and changed the Clarified the auto connect enumeration regarding which type of Added installation section and fixed some whitespace. Doc: Fixing spacing bug in columns Doc: Fixing bug in QML tutorial ...
Diffstat (limited to 'qmake')
0 files changed, 0 insertions, 0 deletions