summaryrefslogtreecommitdiffstats
path: root/examples/dialogs/extension
diff options
context:
space:
mode:
Diffstat (limited to 'examples/dialogs/extension')
-rw-r--r--examples/dialogs/extension/extension.pro2
-rw-r--r--examples/dialogs/extension/finddialog.cpp35
-rw-r--r--examples/dialogs/extension/main.cpp4
3 files changed, 0 insertions, 41 deletions
diff --git a/examples/dialogs/extension/extension.pro b/examples/dialogs/extension/extension.pro
index 5511f37150..7e11dda4ab 100644
--- a/examples/dialogs/extension/extension.pro
+++ b/examples/dialogs/extension/extension.pro
@@ -8,7 +8,5 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/extension
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/dialogs/extension/finddialog.cpp b/examples/dialogs/extension/finddialog.cpp
index 0e797edf81..6edaa06594 100644
--- a/examples/dialogs/extension/finddialog.cpp
+++ b/examples/dialogs/extension/finddialog.cpp
@@ -74,42 +74,11 @@ FindDialog::FindDialog(QWidget *parent)
//! [2]
//! [3]
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
- // Create menu
- QMenu *menu = new QMenu(this);
-
- // Create Find menu item
- menu->addAction(tr("Find"));
-
- // Create More menu item
- QAction *moreAction = menu->addAction(tr("More"));
- moreAction->setCheckable(true);
-
- // Create Options CBA
- QAction *optionAction = new QAction(tr("Options"), this);
-
- // Set defined menu into Options button
- optionAction->setMenu(menu);
- optionAction->setSoftKeyRole(QAction::PositiveSoftKey);
- addAction(optionAction);
-
- // Connect More menu item to setVisible slot
- connect(moreAction, SIGNAL(triggered(bool)), extension, SLOT(setVisible(bool)));
-
- // Create Exit CBA
- QAction *backSoftKeyAction = new QAction(QString(tr("Exit")), this);
- backSoftKeyAction->setSoftKeyRole(QAction::NegativeSoftKey);
-
- // Exit button closes the application
- connect(backSoftKeyAction, SIGNAL(triggered()), qApp, SLOT(quit()));
- addAction(backSoftKeyAction);
-#else
buttonBox = new QDialogButtonBox(Qt::Vertical);
buttonBox->addButton(findButton, QDialogButtonBox::ActionRole);
buttonBox->addButton(moreButton, QDialogButtonBox::ActionRole);
connect(moreButton, SIGNAL(toggled(bool)), extension, SLOT(setVisible(bool)));
-#endif
QVBoxLayout *extensionLayout = new QVBoxLayout;
extensionLayout->setMargin(0);
@@ -130,13 +99,9 @@ FindDialog::FindDialog(QWidget *parent)
leftLayout->addWidget(fromStartCheckBox);
QGridLayout *mainLayout = new QGridLayout;
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_SIMULATOR)
mainLayout->setSizeConstraint(QLayout::SetFixedSize);
-#endif
mainLayout->addLayout(leftLayout, 0, 0);
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_SIMULATOR)
mainLayout->addWidget(buttonBox, 0, 1);
-#endif
mainLayout->addWidget(extension, 1, 0, 1, 2);
mainLayout->setRowStretch(2, 1);
diff --git a/examples/dialogs/extension/main.cpp b/examples/dialogs/extension/main.cpp
index 9937b6d0b5..b54c1293d1 100644
--- a/examples/dialogs/extension/main.cpp
+++ b/examples/dialogs/extension/main.cpp
@@ -47,11 +47,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
FindDialog dialog;
-#ifdef Q_OS_SYMBIAN
- dialog.showMaximized();
-#else
dialog.show();
-#endif
return app.exec();
}