summaryrefslogtreecommitdiffstats
path: root/demos/browser/settings.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-30 22:23:12 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-30 22:23:12 (GMT)
commit8dc61ad98f4904ccab0ffc2a2b0e0e8f71053156 (patch)
treecaf9f845d3ff0f67960e50c56ca419bd233e86a7 /demos/browser/settings.h
parent998569ea293741f16e0a7fb4a7a249e902966bf7 (diff)
parentff00f606eb76772c1197787713d400cce56bd6c9 (diff)
downloadQt-8dc61ad98f4904ccab0ffc2a2b0e0e8f71053156.zip
Qt-8dc61ad98f4904ccab0ffc2a2b0e0e8f71053156.tar.gz
Qt-8dc61ad98f4904ccab0ffc2a2b0e0e8f71053156.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove debug. Snake: Don't use Behavior with states. QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu Fix application exiting in embedded qml examples QDeclarativeDebug: Destroy incoming connections if already connected Fix VisualDataModel model update handling when rootIndex is specified. Improve test reliability when running in parallel with other tests. Improve stability of test on loaded hw. Improve stability of test on loaded hw.
Diffstat (limited to 'demos/browser/settings.h')
0 files changed, 0 insertions, 0 deletions