diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-28 11:59:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-28 11:59:23 (GMT) |
| commit | 028b4b56fdbc74c89e27feecf047fb5e92752560 (patch) | |
| tree | 4e4c46cbdd2c4f88c90cd8892569ecbd168fab7d /src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp | |
| parent | c9691c62b62c656a9a153b8879f13a5ce71a6d2d (diff) | |
| parent | 6f260fe99f742949bbfcfcf3eebc19486bd09a1e (diff) | |
| download | Qt-028b4b56fdbc74c89e27feecf047fb5e92752560.zip Qt-028b4b56fdbc74c89e27feecf047fb5e92752560.tar.gz Qt-028b4b56fdbc74c89e27feecf047fb5e92752560.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: (21 commits)
Add new QMetaObject test for signal lookup.
Cocoa: implement usage of override cursors
Fix breakage introduced in 21e0423a5c9ecd9da8e141dcfba25e60b55f7fe5
Fix QDirIterator auto test
Fix regressions introduced in 3a5eb87965b60a3e249a16dc48cb06f4759dfb1b
BenchLib: update the result format and self-test.
Fix crash handler regression introduced by c7739f7dd.
Make indexOfMethod not crash when going through a metaobject with methodCount == 0.
Optimise QStringList::join by pre-allocating the final size.
Remove test binary left behind
Whitespace cleanup
cleanups & styling fixes
QFileInfo: Implement additional caching of FileOwner strings
qfileinfo_p.h: removed unnecessary dependency on QFSFileEngine
Simplify QFileInfoPrivate::getFileTime
QFileInfo: Don't re-stat files, when in caching mode
QFileInfoPrivate::Data: don't call clear() from constructors
fix regression introduced in 44766d2
Remove the tests/auto/networkdata dir, since this causes the maketestselftest test fail
Add proper license headers to these files.
...
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp')
0 files changed, 0 insertions, 0 deletions