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>

3 files changed, 23 insertions, 58 deletions

diff --git a/examples/spectrum/app/app.pro b/examples/spectrum/app/app.pro
index edb7e4fdd..120ea43c1 100644
--- a/examples/spectrum/app/app.pro
+++ b/examples/spectrum/app/app.pro
@@ -44,30 +44,15 @@ INCLUDEPATH += $${fftreal_dir}
 
 RESOURCES = spectrum.qrc
 
-symbian {
-    # Platform security capability required to record audio on Symbian
-    TARGET.CAPABILITY = UserEnvironment
-
-    # Provide unique ID for the generated binary, required by Symbian OS
-    TARGET.UID3 = 0xA000E402
-}
-
-
 # Dynamic linkage against FFTReal DLL
 !contains(DEFINES, DISABLE_FFT) {
-    symbian {
-        # Must explicitly add the .dll suffix to ensure dynamic linkage
-        LIBS += -lfftreal.dll
-        QMAKE_LIBDIR += $${fftreal_dir}
+    macx {
+        # Link to fftreal framework
+        LIBS += -F$${fftreal_dir}
+        LIBS += -framework fftreal
     } else {
-        macx {
-            # Link to fftreal framework
-            LIBS += -F$${fftreal_dir}
-            LIBS += -framework fftreal
-        } else {
-            LIBS += -L..$${spectrum_build_dir}
-            LIBS += -lfftreal
-        }
+        LIBS += -L..$${spectrum_build_dir}
+        LIBS += -lfftreal
     }
 }
 
@@ -81,37 +66,26 @@ INSTALLS += sources images
 
 # Deployment
 
-symbian {
-    CONFIG += qt_demo
-
+DESTDIR = ..$${spectrum_build_dir}
+macx {
     !contains(DEFINES, DISABLE_FFT) {
-        # Include FFTReal DLL in the SIS file
-        fftreal.files = ../fftreal.dll
-        fftreal.path = !:/sys/bin
-        DEPLOYMENT += fftreal
+        # Relocate fftreal.framework into spectrum.app bundle
+        framework_dir = ../spectrum.app/Contents/Frameworks
+        framework_name = fftreal.framework/Versions/1/fftreal
+        QMAKE_POST_LINK = \
+            mkdir -p $${framework_dir} &&\
+            rm -rf $${framework_dir}/fftreal.framework &&\
+            cp -R $${fftreal_dir}/fftreal.framework $${framework_dir} &&\
+            install_name_tool -id @executable_path/../Frameworks/$${framework_name} \
+                                $${framework_dir}/$${framework_name} &&\
+            install_name_tool -change $${framework_name} \
+                                @executable_path/../Frameworks/$${framework_name} \
+                                ../spectrum.app/Contents/MacOS/spectrum
     }
 } else {
-    DESTDIR = ..$${spectrum_build_dir}
-    macx {
-        !contains(DEFINES, DISABLE_FFT) {
-            # Relocate fftreal.framework into spectrum.app bundle
-            framework_dir = ../spectrum.app/Contents/Frameworks
-            framework_name = fftreal.framework/Versions/1/fftreal
-            QMAKE_POST_LINK = \
-                mkdir -p $${framework_dir} &&\
-                rm -rf $${framework_dir}/fftreal.framework &&\
-                cp -R $${fftreal_dir}/fftreal.framework $${framework_dir} &&\
-                install_name_tool -id @executable_path/../Frameworks/$${framework_name} \
-                                  $${framework_dir}/$${framework_name} &&\
-                install_name_tool -change $${framework_name} \
-                                  @executable_path/../Frameworks/$${framework_name} \
-                                  ../spectrum.app/Contents/MacOS/spectrum
-        }
-    } else {
-        linux-g++*: {
-            # Provide relative path from application to fftreal library
-            QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
-        }
+    linux-g++*: {
+        # Provide relative path from application to fftreal library
+        QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
     }
 }
 
diff --git a/examples/spectrum/app/main.cpp b/examples/spectrum/app/main.cpp
index 0e7c457b1..ca4f078db 100644
--- a/examples/spectrum/app/main.cpp
+++ b/examples/spectrum/app/main.cpp
@@ -47,11 +47,7 @@ int main(int argc, char **argv)
     app.setApplicationName("QtMultimediaKit spectrum analyzer");
     MainWidget w;
 
-#ifdef Q_OS_SYMBIAN
-    w.showMaximized();
-#else
     w.show();
-#endif
 
     return app.exec();
 }
diff --git a/examples/spectrum/app/mainwidget.cpp b/examples/spectrum/app/mainwidget.cpp
index 2bb35c51f..b5cf66e4b 100644
--- a/examples/spectrum/app/mainwidget.cpp
+++ b/examples/spectrum/app/mainwidget.cpp
@@ -149,12 +149,7 @@ void MainWidget::infoMessage(const QString &message, int timeoutMs)
 
 void MainWidget::errorMessage(const QString &heading, const QString &detail)
 {
-#ifdef Q_OS_SYMBIAN
-    const QString message = heading + "\n" + detail;
-    QMessageBox::warning(this, "", message, QMessageBox::Close);
-#else
     QMessageBox::warning(this, heading, detail, QMessageBox::Close);
-#endif
 }
 
 void MainWidget::timerEvent(QTimerEvent *event)