Squashed commit of the changes from the mobile-examples repository

(4.7-generated-declarative branch).

4 files changed, 13 insertions, 4 deletions

diff --git a/examples/widgets/calculator/calculator.cpp b/examples/widgets/calculator/calculator.cpp
index 991ffc3efc..3fbdf03b9a 100644
--- a/examples/widgets/calculator/calculator.cpp
+++ b/examples/widgets/calculator/calculator.cpp
@@ -47,7 +47,7 @@
 
 //! [0]
 Calculator::Calculator(QWidget *parent)
-    : QDialog(parent)
+    : QWidget(parent)
 {
     sumInMemory = 0.0;
     sumSoFar = 0.0;
@@ -98,8 +98,11 @@ Calculator::Calculator(QWidget *parent)
 //! [5]
     QGridLayout *mainLayout = new QGridLayout;
 //! [5] //! [6]
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
+    mainLayout->setSizeConstraint(QLayout::SetNoConstraint);
+#else
     mainLayout->setSizeConstraint(QLayout::SetFixedSize);
-
+#endif
     mainLayout->addWidget(display, 0, 0, 1, 6);
     mainLayout->addWidget(backspaceButton, 1, 0, 1, 2);
     mainLayout->addWidget(clearButton, 1, 2, 1, 2);
diff --git a/examples/widgets/calculator/calculator.h b/examples/widgets/calculator/calculator.h
index e1221f4f70..3548b85625 100644
--- a/examples/widgets/calculator/calculator.h
+++ b/examples/widgets/calculator/calculator.h
@@ -41,7 +41,7 @@
 #ifndef CALCULATOR_H
 #define CALCULATOR_H
 
-#include <QDialog>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 class QLineEdit;
@@ -49,7 +49,7 @@ QT_END_NAMESPACE
 class Button;
 
 //! [0]
-class Calculator : public QDialog
+class Calculator : public QWidget
 {
     Q_OBJECT
 
diff --git a/examples/widgets/calculator/calculator.pro b/examples/widgets/calculator/calculator.pro
index d6bda73629..4c10e845f3 100644
--- a/examples/widgets/calculator/calculator.pro
+++ b/examples/widgets/calculator/calculator.pro
@@ -14,3 +14,5 @@ symbian {
     TARGET.UID3 = 0xA000C602
     CONFIG += qt_example
 }
+maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
+
diff --git a/examples/widgets/calculator/main.cpp b/examples/widgets/calculator/main.cpp
index 0038aa10dd..3974f801b1 100644
--- a/examples/widgets/calculator/main.cpp
+++ b/examples/widgets/calculator/main.cpp
@@ -46,6 +46,10 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     Calculator calc;
+#if defined(Q_OS_SYMBIAN)
+    calc.showMaximized();
+#else
     calc.show();
+#endif
     return app.exec();
 }