summaryrefslogtreecommitdiffstats
path: root/src/declarative/debugger/qdeclarativedebugservice_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-07 23:54:16 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-07 23:54:16 (GMT)
commit0766bf2fa4a89e629bbdad185e4919fd49c033a1 (patch)
tree623aa822f43c0a7cef6495cb5780af8b648178ed /src/declarative/debugger/qdeclarativedebugservice_p.h
parent238833271bf1792c0906b632b165bedf106b5f92 (diff)
parent55dbdc58122da56d9a2b869164f980dde3f91fb3 (diff)
downloadQt-0766bf2fa4a89e629bbdad185e4919fd49c033a1.zip
Qt-0766bf2fa4a89e629bbdad185e4919fd49c033a1.tar.gz
Qt-0766bf2fa4a89e629bbdad185e4919fd49c033a1.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Fix a typo in an EXPECT_FAIL dataset name. Fix a test naming issue. Improve Q_GLOBAL_STATIC macors. Tests build fix. Refactor qscriptjstestsuite to make it more maintainable Refactor qscriptv8testsuite to make it more maintainable
Diffstat (limited to 'src/declarative/debugger/qdeclarativedebugservice_p.h')
0 files changed, 0 insertions, 0 deletions