summaryrefslogtreecommitdiffstats
path: root/tools
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 /tools
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 'tools')
-rw-r--r--[-rwxr-xr-x]tools/qdoc3/doc/config/images/bg_l.pngbin100 -> 100 bytes
-rw-r--r--[-rwxr-xr-x]tools/qdoc3/doc/config/images/bg_l_blank.pngbin84 -> 84 bytes
-rw-r--r--[-rwxr-xr-x]tools/qdoc3/doc/config/images/bg_r.pngbin96 -> 96 bytes
-rw-r--r--[-rwxr-xr-x]tools/qdoc3/doc/config/images/box_bg.pngbin89 -> 89 bytes
-rw-r--r--[-rwxr-xr-x]tools/qdoc3/doc/config/images/breadcrumb.pngbin134 -> 134 bytes
-rw-r--r--[-rwxr-xr-x]tools/qdoc3/doc/config/images/bullet_gt.pngbin124 -> 124 bytes
-rw-r--r--[-rwxr-xr-x]tools/qdoc3/doc/config/images/bullet_sq.pngbin74 -> 74 bytes
-rw-r--r--[-rwxr-xr-x]tools/qdoc3/doc/config/images/feedbackground.pngbin263 -> 263 bytes
-rw-r--r--[-rwxr-xr-x]tools/qdoc3/doc/config/images/horBar.pngbin2807 -> 2807 bytes
-rw-r--r--[-rwxr-xr-x]tools/qdoc3/doc/config/images/page_bg.pngbin84 -> 84 bytes
-rw-r--r--[-rwxr-xr-x]tools/qdoc3/doc/config/images/sprites-combined.pngbin62534 -> 62534 bytes
-rw-r--r--[-rwxr-xr-x]tools/qdoc3/doc/config/scripts/functions.js0
-rw-r--r--[-rwxr-xr-x]tools/qdoc3/doc/config/scripts/jquery.js0
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
index 90b1da1..90b1da1 100755..100644
--- a/tools/qdoc3/doc/config/images/bg_l.png
+++ b/tools/qdoc3/doc/config/images/bg_l.png
Binary files differ
diff --git a/tools/qdoc3/doc/config/images/bg_l_blank.png b/tools/qdoc3/doc/config/images/bg_l_blank.png
index 5a9673d..5a9673d 100755..100644
--- a/tools/qdoc3/doc/config/images/bg_l_blank.png
+++ b/tools/qdoc3/doc/config/images/bg_l_blank.png
Binary files differ
diff --git a/tools/qdoc3/doc/config/images/bg_r.png b/tools/qdoc3/doc/config/images/bg_r.png
index f0fb121..f0fb121 100755..100644
--- a/tools/qdoc3/doc/config/images/bg_r.png
+++ b/tools/qdoc3/doc/config/images/bg_r.png
Binary files differ
diff --git a/tools/qdoc3/doc/config/images/box_bg.png b/tools/qdoc3/doc/config/images/box_bg.png
index 3322f92..3322f92 100755..100644
--- a/tools/qdoc3/doc/config/images/box_bg.png
+++ b/tools/qdoc3/doc/config/images/box_bg.png
Binary files differ
diff --git a/tools/qdoc3/doc/config/images/breadcrumb.png b/tools/qdoc3/doc/config/images/breadcrumb.png
index 0ded551..0ded551 100755..100644
--- a/tools/qdoc3/doc/config/images/breadcrumb.png
+++ b/tools/qdoc3/doc/config/images/breadcrumb.png
Binary files differ
diff --git a/tools/qdoc3/doc/config/images/bullet_gt.png b/tools/qdoc3/doc/config/images/bullet_gt.png
index 7561b4e..7561b4e 100755..100644
--- a/tools/qdoc3/doc/config/images/bullet_gt.png
+++ b/tools/qdoc3/doc/config/images/bullet_gt.png
Binary files differ
diff --git a/tools/qdoc3/doc/config/images/bullet_sq.png b/tools/qdoc3/doc/config/images/bullet_sq.png
index a84845e..a84845e 100755..100644
--- a/tools/qdoc3/doc/config/images/bullet_sq.png
+++ b/tools/qdoc3/doc/config/images/bullet_sq.png
Binary files differ
diff --git a/tools/qdoc3/doc/config/images/feedbackground.png b/tools/qdoc3/doc/config/images/feedbackground.png
index 3a38d99..3a38d99 100755..100644
--- a/tools/qdoc3/doc/config/images/feedbackground.png
+++ b/tools/qdoc3/doc/config/images/feedbackground.png
Binary files differ
diff --git a/tools/qdoc3/doc/config/images/horBar.png b/tools/qdoc3/doc/config/images/horBar.png
index 100fe91..100fe91 100755..100644
--- a/tools/qdoc3/doc/config/images/horBar.png
+++ b/tools/qdoc3/doc/config/images/horBar.png
Binary files differ
diff --git a/tools/qdoc3/doc/config/images/page_bg.png b/tools/qdoc3/doc/config/images/page_bg.png
index 9b3bd99..9b3bd99 100755..100644
--- a/tools/qdoc3/doc/config/images/page_bg.png
+++ b/tools/qdoc3/doc/config/images/page_bg.png
Binary files differ
diff --git a/tools/qdoc3/doc/config/images/sprites-combined.png b/tools/qdoc3/doc/config/images/sprites-combined.png
index 3a48b21..3a48b21 100755..100644
--- a/tools/qdoc3/doc/config/images/sprites-combined.png
+++ b/tools/qdoc3/doc/config/images/sprites-combined.png
Binary files differ
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