summaryrefslogtreecommitdiffstats
path: root/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-18 00:09:31 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-18 00:09:31 (GMT)
commit6a48a578f5ab6bf8a7456e3d0bcb2eb8b0b55352 (patch)
tree6da77fbe2d56d5b95587a6785a4ac8039b06141a /src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp
parentf7375a3842168400c3c75d0765989d4181067c20 (diff)
parent34d7dd61ed259e4e6e05d191a9a6da4c8bb41216 (diff)
downloadQt-6a48a578f5ab6bf8a7456e3d0bcb2eb8b0b55352.zip
Qt-6a48a578f5ab6bf8a7456e3d0bcb2eb8b0b55352.tar.gz
Qt-6a48a578f5ab6bf8a7456e3d0bcb2eb8b0b55352.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: QNAM: make systemProxyForQuery respect http_proxy Allow setting the runtime graphicssystem via QT_DEFAULT_RUNTIME_SYSTEM. Partially revert "Set the graphics system name in the graphics system factory." Minor improvements to whatlog generation in Symbian tools2 builds. Fix linux-symbian cross-compilation configure-phase for platform builing
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp')
0 files changed, 0 insertions, 0 deletions