summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-09 12:17:29 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-09 12:17:29 (GMT)
commit20a3f5a4748f04d8a584040256755af7f97e870d (patch)
tree53576dbebfb781b46f08825ec7950507a724e223 /src/tools
parentdb934a4e287f083f41e6a6ad1d48bbf223588efa (diff)
parent0c9cb9a34d6b472cb53bf1af4616af55b593b616 (diff)
downloadQt-20a3f5a4748f04d8a584040256755af7f97e870d.zip
Qt-20a3f5a4748f04d8a584040256755af7f97e870d.tar.gz
Qt-20a3f5a4748f04d8a584040256755af7f97e870d.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: emit QNetWorkAccessManager::finished on QNetworkReply::abort() Fix -no-gui Don't run XLib check if -no-gui is used
Diffstat (limited to 'src/tools')
0 files changed, 0 insertions, 0 deletions