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 /demos | |
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 '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 fc5c16d..fc5c16d 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 a0ab1fa..a0ab1fa 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 f7467c4..f7467c4 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 f67dd36..f67dd36 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 2a54cd8..2a54cd8 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 f988713..f988713 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 1c6a4f0..1c6a4f0 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 8098ff4..8098ff4 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 defd34c..defd34c 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 4397110..4397110 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 dc4ecbf..dc4ecbf 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 ae6f354..ae6f354 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 dbe586a..dbe586a 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 46a1a73..46a1a73 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 6157c2d..6157c2d 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 bf7bfcb..bf7bfcb 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 86a9071..86a9071 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 17b9513..17b9513 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 833fa99..833fa99 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 3280afa..3280afa 100755..100644 --- a/demos/qtdemo/images/demobg.png +++ b/demos/qtdemo/images/demobg.png |