diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-29 23:01:55 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-29 23:01:55 +1000 |
| commit | e6f5fc28e82732dd214d87bd6c6a8a2efbf89f14 (patch) | |
| tree | 2832e2565aed90653ded8c3d324974b16aab338c /demos | |
| parent | 0a502ef47f1c6bf06c28dd966b63e3963cd2f630 (diff) | |
| parent | 013df7417f1496f476c23251a90aa454687d2f74 (diff) | |
| download | qt4-tools-e6f5fc28e82732dd214d87bd6c6a8a2efbf89f14.tar.gz | |
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 'demos')
20 files changed, 0 insertions, 0 deletions
diff --git a/demos/embedded/styledemo/files/add.png b/demos/embedded/styledemo/files/add.png Binary files differindex fc5c16d4c8..fc5c16d4c8 100755..100644 --- a/demos/embedded/styledemo/files/add.png +++ b/demos/embedded/styledemo/files/add.png diff --git a/demos/embedded/styledemo/files/remove.png b/demos/embedded/styledemo/files/remove.png Binary files differindex a0ab1fa21a..a0ab1fa21a 100755..100644 --- a/demos/embedded/styledemo/files/remove.png +++ b/demos/embedded/styledemo/files/remove.png diff --git a/demos/mobile/qcamera/businesscardhandling.cpp b/demos/mobile/qcamera/businesscardhandling.cpp index f7467c43f2..f7467c43f2 100755..100644 --- a/demos/mobile/qcamera/businesscardhandling.cpp +++ b/demos/mobile/qcamera/businesscardhandling.cpp diff --git a/demos/mobile/qcamera/businesscardhandling.h b/demos/mobile/qcamera/businesscardhandling.h index f67dd366fb..f67dd366fb 100755..100644 --- a/demos/mobile/qcamera/businesscardhandling.h +++ b/demos/mobile/qcamera/businesscardhandling.h diff --git a/demos/mobile/qcamera/button.cpp b/demos/mobile/qcamera/button.cpp index 2a54cd8401..2a54cd8401 100755..100644 --- a/demos/mobile/qcamera/button.cpp +++ b/demos/mobile/qcamera/button.cpp diff --git a/demos/mobile/qcamera/button.h b/demos/mobile/qcamera/button.h index f988713c51..f988713c51 100755..100644 --- a/demos/mobile/qcamera/button.h +++ b/demos/mobile/qcamera/button.h diff --git a/demos/mobile/qcamera/cameraexample.cpp b/demos/mobile/qcamera/cameraexample.cpp index 1c6a4f088e..1c6a4f088e 100755..100644 --- a/demos/mobile/qcamera/cameraexample.cpp +++ b/demos/mobile/qcamera/cameraexample.cpp diff --git a/demos/mobile/qcamera/cameraexample.h b/demos/mobile/qcamera/cameraexample.h index 8098ff4307..8098ff4307 100755..100644 --- a/demos/mobile/qcamera/cameraexample.h +++ b/demos/mobile/qcamera/cameraexample.h diff --git a/demos/mobile/qcamera/contactsdlg.cpp b/demos/mobile/qcamera/contactsdlg.cpp index defd34c190..defd34c190 100755..100644 --- a/demos/mobile/qcamera/contactsdlg.cpp +++ b/demos/mobile/qcamera/contactsdlg.cpp diff --git a/demos/mobile/qcamera/contactsdlg.h b/demos/mobile/qcamera/contactsdlg.h index 4397110426..4397110426 100755..100644 --- a/demos/mobile/qcamera/contactsdlg.h +++ b/demos/mobile/qcamera/contactsdlg.h diff --git a/demos/mobile/qcamera/icons/camera.png b/demos/mobile/qcamera/icons/camera.png Binary files differindex dc4ecbf74f..dc4ecbf74f 100755..100644 --- a/demos/mobile/qcamera/icons/camera.png +++ b/demos/mobile/qcamera/icons/camera.png diff --git a/demos/mobile/qcamera/icons/cameramms_icon.svg b/demos/mobile/qcamera/icons/cameramms_icon.svg index ae6f354337..ae6f354337 100755..100644 --- a/demos/mobile/qcamera/icons/cameramms_icon.svg +++ b/demos/mobile/qcamera/icons/cameramms_icon.svg diff --git a/demos/mobile/qcamera/icons/exit.png b/demos/mobile/qcamera/icons/exit.png Binary files differindex dbe586a934..dbe586a934 100755..100644 --- a/demos/mobile/qcamera/icons/exit.png +++ b/demos/mobile/qcamera/icons/exit.png diff --git a/demos/mobile/qcamera/icons/mms.png b/demos/mobile/qcamera/icons/mms.png Binary files differindex 46a1a73d65..46a1a73d65 100755..100644 --- a/demos/mobile/qcamera/icons/mms.png +++ b/demos/mobile/qcamera/icons/mms.png diff --git a/demos/mobile/qcamera/main.cpp b/demos/mobile/qcamera/main.cpp index 6157c2d456..6157c2d456 100755..100644 --- a/demos/mobile/qcamera/main.cpp +++ b/demos/mobile/qcamera/main.cpp diff --git a/demos/mobile/qcamera/messagehandling.cpp b/demos/mobile/qcamera/messagehandling.cpp index bf7bfcb8d0..bf7bfcb8d0 100755..100644 --- a/demos/mobile/qcamera/messagehandling.cpp +++ b/demos/mobile/qcamera/messagehandling.cpp diff --git a/demos/mobile/qcamera/messagehandling.h b/demos/mobile/qcamera/messagehandling.h index 86a90712ec..86a90712ec 100755..100644 --- a/demos/mobile/qcamera/messagehandling.h +++ b/demos/mobile/qcamera/messagehandling.h diff --git a/demos/mobile/qcamera/qcamera.pro b/demos/mobile/qcamera/qcamera.pro index 17b9513946..17b9513946 100755..100644 --- a/demos/mobile/qcamera/qcamera.pro +++ b/demos/mobile/qcamera/qcamera.pro diff --git a/demos/mobile/qcamera/resources.qrc b/demos/mobile/qcamera/resources.qrc index 833fa99031..833fa99031 100755..100644 --- a/demos/mobile/qcamera/resources.qrc +++ b/demos/mobile/qcamera/resources.qrc diff --git a/demos/qtdemo/images/demobg.png b/demos/qtdemo/images/demobg.png Binary files differindex 3280afaa3e..3280afaa3e 100755..100644 --- a/demos/qtdemo/images/demobg.png +++ b/demos/qtdemo/images/demobg.png |
