diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-03 15:09:53 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-03 15:09:53 (GMT) |
commit | e029b5b7bf8cb8815e33a1e08b6a609dafa25f52 (patch) | |
tree | 713865b357d7087d3c06bc34c6babf2ecdcc1eca /qmake/project.h | |
parent | a9fa8187b1a7efe343e0bf2722cde5c0ef5fa77e (diff) | |
parent | 05a1573eddc6dc404631c9d16474c81aa4cea569 (diff) | |
download | Qt-e029b5b7bf8cb8815e33a1e08b6a609dafa25f52.zip Qt-e029b5b7bf8cb8815e33a1e08b6a609dafa25f52.tar.gz Qt-e029b5b7bf8cb8815e33a1e08b6a609dafa25f52.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed QFileInfo::absolutePath() warning when running "qmake -project"
QTcpServer: Clarify thread affinity of incoming QTcpSocket
Cleared up QEvent documentation for QGraphicsSceneDragDropEvent events.
Updated my changelog entry
QNAM HTTP: Fix bug related to re-sending a request
Adding my changes.
Remove erroneous warning in QFileInfo::absolutePath()
Diffstat (limited to 'qmake/project.h')
0 files changed, 0 insertions, 0 deletions