Merge remote-tracking branch 'qt/4.8'

17 files changed, 121 insertions, 6 deletions

diff --git a/examples/richtext/calendar/calendar.desktop b/examples/richtext/calendar/calendar.desktop
new file mode 100644
index 0000000..41ba6dd
--- /dev/null
+++ b/examples/richtext/calendar/calendar.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Name=Calendar
+Exec=/opt/usr/bin/calendar
+Icon=calendar
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
diff --git a/examples/richtext/calendar/calendar.pro b/examples/richtext/calendar/calendar.pro
index efb99b4..6df4376 100644
--- a/examples/richtext/calendar/calendar.pro
+++ b/examples/richtext/calendar/calendar.pro
@@ -2,6 +2,9 @@ HEADERS     = mainwindow.h
 SOURCES     = main.cpp \
               mainwindow.cpp
 
+# App cannot be with name "calendar" in Symbian due to same named system component.
+symbian: TARGET = calendarapp
+
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/richtext/calendar
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendar.pro
@@ -9,3 +12,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/richtext/calendar
 INSTALLS += target sources
 
 symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
+
diff --git a/examples/richtext/calendar/main.cpp b/examples/richtext/calendar/main.cpp
index b23e883..9c1141f 100644
--- a/examples/richtext/calendar/main.cpp
+++ b/examples/richtext/calendar/main.cpp
@@ -46,7 +46,13 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     MainWindow window;
+#if defined(Q_OS_SYMBIAN)
+    window.showMaximized();
+#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
+    window.show();
+#else
     window.resize(640, 256);
     window.show();
+#endif
     return app.exec();
 }
diff --git a/examples/richtext/calendar/mainwindow.cpp b/examples/richtext/calendar/mainwindow.cpp
index 5117c03..60d7c51 100644
--- a/examples/richtext/calendar/mainwindow.cpp
+++ b/examples/richtext/calendar/mainwindow.cpp
@@ -70,7 +70,6 @@ MainWindow::MainWindow()
     QLabel *fontSizeLabel = new QLabel(tr("Font size:"));
     QSpinBox *fontSizeSpinBox = new QSpinBox;
     fontSizeSpinBox->setRange(1, 64);
-    fontSizeSpinBox->setValue(10);
 
     editor = new QTextBrowser;
     insertCalendar();
@@ -83,6 +82,12 @@ MainWindow::MainWindow()
             this, SLOT(setFontSize(int)));
 //! [3]
 
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
+    fontSizeSpinBox->setValue(4);
+#else
+    fontSizeSpinBox->setValue(10);
+#endif
+
 //! [4]
     QHBoxLayout *controlsLayout = new QHBoxLayout;
     controlsLayout->addWidget(dateLabel);
diff --git a/examples/richtext/orderform/detailsdialog.cpp b/examples/richtext/orderform/detailsdialog.cpp
index 9aa8535..b12de14 100644
--- a/examples/richtext/orderform/detailsdialog.cpp
+++ b/examples/richtext/orderform/detailsdialog.cpp
@@ -53,8 +53,13 @@ DetailsDialog::DetailsDialog(const QString &title, QWidget *parent)
     nameEdit = new QLineEdit;
     addressEdit = new QTextEdit;
 
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
+    offersCheckBox = new QCheckBox(tr("Send information about\n"
+                                      "products and special offers"));
+#else
     offersCheckBox = new QCheckBox(tr("Send information about products and "
                                       "special offers"));
+#endif
 
     setupItemsTable();
 
@@ -66,6 +71,30 @@ DetailsDialog::DetailsDialog(const QString &title, QWidget *parent)
 //! [0]
 
 //! [1]
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
+    QWidget *widgetSubscriber = new QWidget;
+    QGridLayout *subscriberLayout = new QGridLayout;
+    subscriberLayout->addWidget(nameLabel, 0, 0);
+    subscriberLayout->addWidget(nameEdit, 0, 1);
+    subscriberLayout->addWidget(addressLabel, 1, 0);
+    subscriberLayout->addWidget(addressEdit, 1, 1);
+    subscriberLayout->addWidget(offersCheckBox, 2, 0, 1, 2);
+    widgetSubscriber->setLayout(subscriberLayout);
+
+    QWidget *widgetOrder = new QWidget;
+    QVBoxLayout *orderLayout = new QVBoxLayout;
+    orderLayout->addWidget(itemsTable);
+    widgetOrder->setLayout(orderLayout);
+
+    QTabWidget *tabWidget = new QTabWidget;
+    tabWidget->addTab(widgetSubscriber, "Subscriber");
+    tabWidget->addTab(widgetOrder, "Order");
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(tabWidget);
+    mainLayout->addWidget(buttonBox);
+    setLayout(mainLayout);
+#else
     QGridLayout *mainLayout = new QGridLayout;
     mainLayout->addWidget(nameLabel, 0, 0);
     mainLayout->addWidget(nameEdit, 0, 1);
@@ -75,6 +104,7 @@ DetailsDialog::DetailsDialog(const QString &title, QWidget *parent)
     mainLayout->addWidget(offersCheckBox, 2, 1, 1, 2);
     mainLayout->addWidget(buttonBox, 3, 0, 1, 3);
     setLayout(mainLayout);
+#endif
 
     setWindowTitle(title);
 }
diff --git a/examples/richtext/orderform/main.cpp b/examples/richtext/orderform/main.cpp
index 3ad32b8..a89aa76 100644
--- a/examples/richtext/orderform/main.cpp
+++ b/examples/richtext/orderform/main.cpp
@@ -47,8 +47,14 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     MainWindow window;
+#if defined(Q_OS_SYMBIAN)
+    window.showMaximized();
+#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
+    windows.show();
+#else
     window.resize(640, 480);
     window.show();
+#endif
     window.createSample();
     return app.exec();
 }
diff --git a/examples/richtext/orderform/orderform.desktop b/examples/richtext/orderform/orderform.desktop
new file mode 100644
index 0000000..4690cbc
--- /dev/null
+++ b/examples/richtext/orderform/orderform.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Name=Order Form
+Exec=/opt/usr/bin/orderform
+Icon=orderform
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
diff --git a/examples/richtext/orderform/orderform.pro b/examples/richtext/orderform/orderform.pro
index dee2855..ebe2ece 100644
--- a/examples/richtext/orderform/orderform.pro
+++ b/examples/richtext/orderform/orderform.pro
@@ -11,3 +11,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/richtext/orderform
 INSTALLS += target sources
 
 symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
+
diff --git a/examples/richtext/richtext.pro b/examples/richtext/richtext.pro
index 1440de2..d4ac378 100644
--- a/examples/richtext/richtext.pro
+++ b/examples/richtext/richtext.pro
@@ -11,4 +11,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS richtext.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/richtext
 INSTALLS += target sources
 
-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
diff --git a/examples/richtext/syntaxhighlighter/main.cpp b/examples/richtext/syntaxhighlighter/main.cpp
index eecfb12..e0e5e4f 100644
--- a/examples/richtext/syntaxhighlighter/main.cpp
+++ b/examples/richtext/syntaxhighlighter/main.cpp
@@ -46,7 +46,13 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     MainWindow window;
+#if defined(Q_OS_SYMBIAN)
+    window.showMaximized();
+#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
+    window.show();
+#else
     window.resize(640, 512);
     window.show();
+#endif
     return app.exec();
 }
diff --git a/examples/richtext/syntaxhighlighter/syntaxhighlighter.desktop b/examples/richtext/syntaxhighlighter/syntaxhighlighter.desktop
new file mode 100644
index 0000000..2e3c833
--- /dev/null
+++ b/examples/richtext/syntaxhighlighter/syntaxhighlighter.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Name=Syntax Highlighter
+Exec=/opt/usr/bin/syntaxhighlighter
+Icon=syntaxhighlighter
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
diff --git a/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro b/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
index 67aa1ff..f2834bd 100644
--- a/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
+++ b/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
@@ -17,3 +17,5 @@ wince*: {
    addFiles.path = .
    DEPLOYMENT += addFiles
 }
+maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
+
diff --git a/examples/richtext/textobject/main.cpp b/examples/richtext/textobject/main.cpp
index 2b95252..1d1d433 100644
--- a/examples/richtext/textobject/main.cpp
+++ b/examples/richtext/textobject/main.cpp
@@ -47,8 +47,10 @@ int main(int argv, char **args)
     QApplication app(argv, args);
 
     Window window;
+#if defined(Q_OS_SYMBIAN)
+    window.showMaximized();
+#else
     window.show();
-
+#endif
     return app.exec();
 }
-
diff --git a/examples/richtext/textobject/resources.qrc b/examples/richtext/textobject/resources.qrc
new file mode 100644
index 0000000..39b2f5d
--- /dev/null
+++ b/examples/richtext/textobject/resources.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>files/heart.svg</file>
+    </qresource>
+</RCC>
diff --git a/examples/richtext/textobject/textobject.desktop b/examples/richtext/textobject/textobject.desktop
new file mode 100644
index 0000000..1b0980f
--- /dev/null
+++ b/examples/richtext/textobject/textobject.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Name=Text Object
+Exec=/opt/usr/bin/textobject
+Icon=textobject
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
diff --git a/examples/richtext/textobject/textobject.pro b/examples/richtext/textobject/textobject.pro
index 222b0fe..422770b 100644
--- a/examples/richtext/textobject/textobject.pro
+++ b/examples/richtext/textobject/textobject.pro
@@ -6,13 +6,16 @@ SOURCES         = main.cpp \
 
 QT += svg
 
+RESOURCES       = resources.qrc
+
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/richtext/textobject
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/richtext/textobject
 INSTALLS += target sources
 
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
 filesToDeploy.files = files/*.svg
 filesToDeploy.path = files
 DEPLOYMENT += filesToDeploy
-
diff --git a/examples/richtext/textobject/window.cpp b/examples/richtext/textobject/window.cpp
index 7feb918..e43ac28 100644
--- a/examples/richtext/textobject/window.cpp
+++ b/examples/richtext/textobject/window.cpp
@@ -96,7 +96,7 @@ void Window::setupGui()
     fileNameLineEdit = new QLineEdit;
     insertTextObjectButton = new QPushButton(tr("Insert Image"));
 
-    fileNameLineEdit->setText("./files/heart.svg");
+    fileNameLineEdit->setText(":/files/heart.svg");
     connect(insertTextObjectButton, SIGNAL(clicked()),
             this, SLOT(insertTextObject()));