summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qgesturemanager.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-25 08:26:14 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-25 08:26:14 (GMT)
commit5c45c66b1743645b77826ad61508a79eadd48414 (patch)
tree6e1939a716b2a8e2f45c4d2fb396ca16118e18cb /src/gui/kernel/qgesturemanager.cpp
parent955189bf5ee3a00a82b016870a6d704be03d6934 (diff)
parenta30ad513df3af7e558d079df405a90e8601d2e74 (diff)
downloadQt-5c45c66b1743645b77826ad61508a79eadd48414.zip
Qt-5c45c66b1743645b77826ad61508a79eadd48414.tar.gz
Qt-5c45c66b1743645b77826ad61508a79eadd48414.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed a compile error on Mac. QNAM HTTP: Fix a warning QNAM: Move a qRegisterMetaType QNAM: New QNetworkReply::setFinished() protected function A few tiny improvements to the QDeclarativeXMLHTTPRequest. Added encoding conversion functions to QStringRef.
Diffstat (limited to 'src/gui/kernel/qgesturemanager.cpp')
0 files changed, 0 insertions, 0 deletions