Squashed commit of the changes from the mobile-examples repository

(4.7-generated-declarative branch).

3 files changed, 37 insertions, 5 deletions

diff --git a/examples/animation/appchooser/appchooser.desktop b/examples/animation/appchooser/appchooser.desktop
new file mode 100644
index 0000000..8e413e9
--- /dev/null
+++ b/examples/animation/appchooser/appchooser.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Name=Application Chooser
+Exec=/opt/usr/bin/appchooser
+Icon=appchooser
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
diff --git a/examples/animation/appchooser/appchooser.pro b/examples/animation/appchooser/appchooser.pro
index 7d45da2..8355c6f 100644
--- a/examples/animation/appchooser/appchooser.pro
+++ b/examples/animation/appchooser/appchooser.pro
@@ -11,3 +11,4 @@ symbian {
     TARGET.UID3 = 0xA000E3F5
     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
+maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
diff --git a/examples/animation/appchooser/main.cpp b/examples/animation/appchooser/main.cpp
index 86ec073..3788533 100644
--- a/examples/animation/appchooser/main.cpp
+++ b/examples/animation/appchooser/main.cpp
@@ -80,6 +80,21 @@ private:
     QPixmap p;
 };
 
+class GraphicsView : public QGraphicsView
+{
+    Q_OBJECT
+public:
+    GraphicsView(QGraphicsScene *scene, QWidget *parent = 0) : QGraphicsView(scene, parent)
+    {
+    }
+
+    virtual void resizeEvent(QResizeEvent *event)
+    {
+        fitInView(sceneRect(), Qt::KeepAspectRatio);
+    }
+};
+
+
 void createStates(const QObjectList &objects,
                   const QRect &selectedRect, QState *parent)
 {
@@ -112,10 +127,10 @@ int main(int argc, char **argv)
     p3->setObjectName("p3");
     p4->setObjectName("p4");
 
-    p1->setGeometry(QRectF(0.0, 0.0, 64.0, 64.0));
-    p2->setGeometry(QRectF(236.0, 0.0, 64.0, 64.0));
+    p1->setGeometry(QRectF(  0.0,   0.0, 64.0, 64.0));
+    p2->setGeometry(QRectF(236.0,   0.0, 64.0, 64.0));
     p3->setGeometry(QRectF(236.0, 236.0, 64.0, 64.0));
-    p4->setGeometry(QRectF(0.0, 236.0, 64.0, 64.0));
+    p4->setGeometry(QRectF(  0.0, 236.0, 64.0, 64.0));
 
     QGraphicsScene scene(0, 0, 300, 300);
     scene.setBackgroundBrush(Qt::white);
@@ -124,7 +139,7 @@ int main(int argc, char **argv)
     scene.addItem(p3);
     scene.addItem(p4);
 
-    QGraphicsView window(&scene);
+    GraphicsView window(&scene);
     window.setFrameStyle(0);
     window.setAlignment(Qt::AlignLeft | Qt::AlignTop);
     window.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -135,12 +150,13 @@ int main(int argc, char **argv)
 
     QState *group = new QState(&machine);
     group->setObjectName("group");
+
     QRect selectedRect(86, 86, 128, 128);
 
     QState *idleState = new QState(group);
     group->setInitialState(idleState);
 
-    QObjectList objects; 
+    QObjectList objects;
     objects << p1 << p2 << p3 << p4;
     createStates(objects, selectedRect, group);
     createAnimations(objects, &machine);
@@ -148,8 +164,12 @@ int main(int argc, char **argv)
     machine.setInitialState(group);
     machine.start();
 
+#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
+    window.showMaximized();
+#else
     window.resize(300, 300);
     window.show();
+#endif
 
     return app.exec();
 }