diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-18 09:54:31 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-18 15:47:49 +0200 |
commit | 87274e272d2a854563066489e20d019b4e6320de (patch) | |
tree | d01e71403a41db3ca2b83599fcc7036d79d7a13e /examples/dialogs/extension/finddialog.cpp | |
parent | 08e24858607d1b1483fb1faa54effa957501cfbb (diff) |
QtBase examples: Remove Maemo/Symbian-specific code.
- Maemo/Symbian are no longer supported and QWidget-based examples
are no longer supposed to run on mobile platforms, so, remove any
Maemo/Symbian or mobile-specific code from source files and
profiles.
- Remove Maemo/Symbian vibration examples.
- Change Q_WS_MAC/WIN to Q_OS_MAC/WIN where appropriate.
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Change-Id: I488a0adadb98934567aa6416206a80465c9c3a81
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'examples/dialogs/extension/finddialog.cpp')
-rw-r--r-- | examples/dialogs/extension/finddialog.cpp | 35 |
1 files changed, 0 insertions, 35 deletions
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); |