summaryrefslogtreecommitdiffstats
path: root/examples/tutorials/modelview/5_edit/mymodel.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-29 13:01:55 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-29 13:01:55 (GMT)
commite6f5fc28e82732dd214d87bd6c6a8a2efbf89f14 (patch)
tree2832e2565aed90653ded8c3d324974b16aab338c /examples/tutorials/modelview/5_edit/mymodel.h
parent0a502ef47f1c6bf06c28dd966b63e3963cd2f630 (diff)
parent013df7417f1496f476c23251a90aa454687d2f74 (diff)
downloadQt-e6f5fc28e82732dd214d87bd6c6a8a2efbf89f14.zip
Qt-e6f5fc28e82732dd214d87bd6c6a8a2efbf89f14.tar.gz
Qt-e6f5fc28e82732dd214d87bd6c6a8a2efbf89f14.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Set execution bits for more scripts. Set execution bits for .test files. Fix more permissions (no execute bit). Fix permission (no execute bit). QGraphicsLayoutItem - bound constraint the minimum and maximum size Notify X11 of its resizable state through MWM Hints.
Diffstat (limited to 'examples/tutorials/modelview/5_edit/mymodel.h')
-rw-r--r--[-rwxr-xr-x]examples/tutorials/modelview/5_edit/mymodel.h0
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/tutorials/modelview/5_edit/mymodel.h b/examples/tutorials/modelview/5_edit/mymodel.h
index ecfd58e..ecfd58e 100755..100644
--- a/examples/tutorials/modelview/5_edit/mymodel.h
+++ b/examples/tutorials/modelview/5_edit/mymodel.h