diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-29 13:01:55 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-29 13:01:55 (GMT) |
commit | e6f5fc28e82732dd214d87bd6c6a8a2efbf89f14 (patch) | |
tree | 2832e2565aed90653ded8c3d324974b16aab338c /tools | |
parent | 0a502ef47f1c6bf06c28dd966b63e3963cd2f630 (diff) | |
parent | 013df7417f1496f476c23251a90aa454687d2f74 (diff) | |
download | Qt-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 'tools')
13 files changed, 0 insertions, 0 deletions
diff --git a/tools/qdoc3/doc/config/images/bg_l.png b/tools/qdoc3/doc/config/images/bg_l.png Binary files differindex 90b1da1..90b1da1 100755..100644 --- a/tools/qdoc3/doc/config/images/bg_l.png +++ b/tools/qdoc3/doc/config/images/bg_l.png diff --git a/tools/qdoc3/doc/config/images/bg_l_blank.png b/tools/qdoc3/doc/config/images/bg_l_blank.png Binary files differindex 5a9673d..5a9673d 100755..100644 --- a/tools/qdoc3/doc/config/images/bg_l_blank.png +++ b/tools/qdoc3/doc/config/images/bg_l_blank.png diff --git a/tools/qdoc3/doc/config/images/bg_r.png b/tools/qdoc3/doc/config/images/bg_r.png Binary files differindex f0fb121..f0fb121 100755..100644 --- a/tools/qdoc3/doc/config/images/bg_r.png +++ b/tools/qdoc3/doc/config/images/bg_r.png diff --git a/tools/qdoc3/doc/config/images/box_bg.png b/tools/qdoc3/doc/config/images/box_bg.png Binary files differindex 3322f92..3322f92 100755..100644 --- a/tools/qdoc3/doc/config/images/box_bg.png +++ b/tools/qdoc3/doc/config/images/box_bg.png diff --git a/tools/qdoc3/doc/config/images/breadcrumb.png b/tools/qdoc3/doc/config/images/breadcrumb.png Binary files differindex 0ded551..0ded551 100755..100644 --- a/tools/qdoc3/doc/config/images/breadcrumb.png +++ b/tools/qdoc3/doc/config/images/breadcrumb.png diff --git a/tools/qdoc3/doc/config/images/bullet_gt.png b/tools/qdoc3/doc/config/images/bullet_gt.png Binary files differindex 7561b4e..7561b4e 100755..100644 --- a/tools/qdoc3/doc/config/images/bullet_gt.png +++ b/tools/qdoc3/doc/config/images/bullet_gt.png diff --git a/tools/qdoc3/doc/config/images/bullet_sq.png b/tools/qdoc3/doc/config/images/bullet_sq.png Binary files differindex a84845e..a84845e 100755..100644 --- a/tools/qdoc3/doc/config/images/bullet_sq.png +++ b/tools/qdoc3/doc/config/images/bullet_sq.png diff --git a/tools/qdoc3/doc/config/images/feedbackground.png b/tools/qdoc3/doc/config/images/feedbackground.png Binary files differindex 3a38d99..3a38d99 100755..100644 --- a/tools/qdoc3/doc/config/images/feedbackground.png +++ b/tools/qdoc3/doc/config/images/feedbackground.png diff --git a/tools/qdoc3/doc/config/images/horBar.png b/tools/qdoc3/doc/config/images/horBar.png Binary files differindex 100fe91..100fe91 100755..100644 --- a/tools/qdoc3/doc/config/images/horBar.png +++ b/tools/qdoc3/doc/config/images/horBar.png diff --git a/tools/qdoc3/doc/config/images/page_bg.png b/tools/qdoc3/doc/config/images/page_bg.png Binary files differindex 9b3bd99..9b3bd99 100755..100644 --- a/tools/qdoc3/doc/config/images/page_bg.png +++ b/tools/qdoc3/doc/config/images/page_bg.png diff --git a/tools/qdoc3/doc/config/images/sprites-combined.png b/tools/qdoc3/doc/config/images/sprites-combined.png Binary files differindex 3a48b21..3a48b21 100755..100644 --- a/tools/qdoc3/doc/config/images/sprites-combined.png +++ b/tools/qdoc3/doc/config/images/sprites-combined.png diff --git a/tools/qdoc3/doc/config/scripts/functions.js b/tools/qdoc3/doc/config/scripts/functions.js index af204d8..af204d8 100755..100644 --- a/tools/qdoc3/doc/config/scripts/functions.js +++ b/tools/qdoc3/doc/config/scripts/functions.js diff --git a/tools/qdoc3/doc/config/scripts/jquery.js b/tools/qdoc3/doc/config/scripts/jquery.js index 0c7294c..0c7294c 100755..100644 --- a/tools/qdoc3/doc/config/scripts/jquery.js +++ b/tools/qdoc3/doc/config/scripts/jquery.js |