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 /examples/declarative | |
| 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 'examples/declarative')
| -rw-r--r--[-rwxr-xr-x] | examples/declarative/shadereffects/main.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/declarative/shadereffects/shadereffects.pro | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/declarative/tutorials/samegame/samegame4/content/samegame.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/declarative/tutorials/samegame/samegame4/highscores/scores.php | 0 |
6 files changed, 0 insertions, 0 deletions
diff --git a/examples/declarative/shadereffects/main.cpp b/examples/declarative/shadereffects/main.cpp index e191bfa..e191bfa 100755..100644 --- a/examples/declarative/shadereffects/main.cpp +++ b/examples/declarative/shadereffects/main.cpp diff --git a/examples/declarative/shadereffects/shadereffects.pro b/examples/declarative/shadereffects/shadereffects.pro index 58e7ab7..58e7ab7 100755..100644 --- a/examples/declarative/shadereffects/shadereffects.pro +++ b/examples/declarative/shadereffects/shadereffects.pro diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js index ccc3f9d..ccc3f9d 100755..100644 --- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js +++ b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml b/examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml index c3fd90d..c3fd90d 100755..100644 --- a/examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml +++ b/examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl b/examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl index 670354c..670354c 100755..100644 --- a/examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl +++ b/examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php b/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php index daf480e..daf480e 100755..100644 --- a/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php +++ b/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php |