diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-06 13:44:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-06 13:44:42 (GMT) |
| commit | 7a2c04a3b198df42e69e9700f550f39aac319fd4 (patch) | |
| tree | d1c92ed0cf8f0c894ad6b7a589d2946f815ccdd5 /src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp | |
| parent | 1f6ca759736eaf8eee7df6bec657e9806602543b (diff) | |
| parent | fa9c62460791c9b9add365fc9543ec0392f50cee (diff) | |
| download | Qt-7a2c04a3b198df42e69e9700f550f39aac319fd4.zip Qt-7a2c04a3b198df42e69e9700f550f39aac319fd4.tar.gz Qt-7a2c04a3b198df42e69e9700f550f39aac319fd4.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:
Adapt the TapAndHold recognizer to non-touch too
add setNativeArguments() and nativeArguments()
fix bogus return value from qprocess::execute()
qdoc: Simplified code to enable fixing of QTBUG-6340.
Doc: fixing img style
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp')
0 files changed, 0 insertions, 0 deletions