Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 29 Nov 2011 13:01:55 +0000 (23:01 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 29 Nov 2011 13:01:55 +0000 (23:01 +1000)
commite6f5fc28e82732dd214d87bd6c6a8a2efbf89f14
tree2832e2565aed90653ded8c3d324974b16aab338c
parent0a502ef47f1c6bf06c28dd966b63e3963cd2f630
parent013df7417f1496f476c23251a90aa454687d2f74
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.
examples/declarative/shadereffects/main.cpp
examples/declarative/shadereffects/shadereffects.pro