summaryrefslogtreecommitdiffstats
path: root/demos/declarative/samegame/content/Dialog.qml
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-04 21:39:15 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-04 21:39:15 (GMT)
commit7474ad656269aec1352d166bb5a4435086d48482 (patch)
tree2791036aa8644ab759dc81eb7317de78589026a9 /demos/declarative/samegame/content/Dialog.qml
parent7a413f40f8db4f20277f153c1e771da478a5e991 (diff)
parent5762a988fbcd95c9c44e58993c25f5cd1d53f897 (diff)
downloadQt-7474ad656269aec1352d166bb5a4435086d48482.zip
Qt-7474ad656269aec1352d166bb5a4435086d48482.tar.gz
Qt-7474ad656269aec1352d166bb5a4435086d48482.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: Use a shared QScriptEngine for debugger console command scripts Fix QtScript debugger hang/crash issue with updating locals model doc: Fixed some qdoc warnings. Always activate popup windows on show doc: Fixed some qdoc warnings. Add the QMAKE_FILE_EXT variable to extra compilers generation. Cocoa: Tool Windows steal focus from the main window qdoc3: Removed a debug output. Update QTestLib documentation with chart use case.
Diffstat (limited to 'demos/declarative/samegame/content/Dialog.qml')
0 files changed, 0 insertions, 0 deletions