diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-07-19 10:40:05 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-19 03:06:23 +0200 |
| commit | eccb43d73c08b85bab89d8f632d423b63592e14f (patch) | |
| tree | e16b44f1548a48f49b64c58263dd067b67232a8e /examples/radio | |
| parent | 1403a1c7be7892ad4d1c5d04c143a318055fb36b (diff) | |
Remove a few more obsolete parts.
Change-Id: I3a001f01ab7fd8cf63452126037b98c1b01df80d
Reviewed-on: http://codereview.qt.nokia.com/1797
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'examples/radio')
| -rw-r--r-- | examples/radio/main.cpp | 4 | ||||
| -rw-r--r-- | examples/radio/radio.cpp | 20 | ||||
| -rw-r--r-- | examples/radio/radio.pro | 4 |
3 files changed, 0 insertions, 28 deletions
diff --git a/examples/radio/main.cpp b/examples/radio/main.cpp index 89e2c70b6..959a740f4 100644 --- a/examples/radio/main.cpp +++ b/examples/radio/main.cpp @@ -47,11 +47,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); Radio radio; -#ifdef Q_OS_SYMBIAN - radio.showMaximized(); -#else radio.show(); -#endif return app.exec(); }; diff --git a/examples/radio/radio.cpp b/examples/radio/radio.cpp index b37b0b551..93f44c05e 100644 --- a/examples/radio/radio.cpp +++ b/examples/radio/radio.cpp @@ -55,9 +55,6 @@ Radio::Radio() QWidget *window = new QWidget; QVBoxLayout* layout = new QVBoxLayout; QHBoxLayout* buttonBar = new QHBoxLayout; -#if defined Q_OS_SYMBIAN // this is so that we can see all buttons also in 3.1 devices, where the screens are smaller.. - QHBoxLayout* buttonBar2 = new QHBoxLayout; -#endif QHBoxLayout* topBar = new QHBoxLayout; layout->addLayout(topBar); @@ -72,22 +69,13 @@ Radio::Radio() else signal->setText(tr("No radio found")); topBar->addWidget(signal); -#if defined Q_WS_MAEMO_5 - QSpacerItem *spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum); - topBar->addItem(spacer); - volumeSlider = new QSlider(Qt::Horizontal,this); -#else volumeSlider = new QSlider(Qt::Vertical,this); -#endif volumeSlider->setRange(0,100); volumeSlider->setValue(50); connect(volumeSlider,SIGNAL(valueChanged(int)),this,SLOT(updateVolume(int))); topBar->addWidget(volumeSlider); layout->addLayout(buttonBar); -#if defined Q_OS_SYMBIAN - layout->addLayout(buttonBar2); -#endif searchLeft = new QPushButton; searchLeft->setText(tr("scan Down")); @@ -97,20 +85,12 @@ Radio::Radio() left = new QPushButton; left->setText(tr("Freq Down")); connect(left,SIGNAL(clicked()),SLOT(freqDown())); -#if defined Q_OS_SYMBIAN - buttonBar2->addWidget(left); -#else buttonBar->addWidget(left); -#endif right = new QPushButton; connect(right,SIGNAL(clicked()),SLOT(freqUp())); right->setText(tr("Freq Up")); -#if defined Q_OS_SYMBIAN - buttonBar2->addWidget(right); -#else buttonBar->addWidget(right); -#endif searchRight = new QPushButton; searchRight->setText(tr("scan Up")); diff --git a/examples/radio/radio.pro b/examples/radio/radio.pro index b0b9ff3dc..db4bb0d4d 100644 --- a/examples/radio/radio.pro +++ b/examples/radio/radio.pro @@ -10,10 +10,6 @@ SOURCES = \ main.cpp \ radio.cpp -symbian: { - TARGET.CAPABILITY = UserEnvironment WriteDeviceData ReadDeviceData SwEvent -} - target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/radio sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/radio |