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/audiorecorder | |
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/audiorecorder')
-rw-r--r-- | examples/audiorecorder/audiorecorder.cpp | 2 | ||||
-rw-r--r-- | examples/audiorecorder/audiorecorder.pro | 6 | ||||
-rw-r--r-- | examples/audiorecorder/main.cpp | 4 |
3 files changed, 1 insertions, 11 deletions
diff --git a/examples/audiorecorder/audiorecorder.cpp b/examples/audiorecorder/audiorecorder.cpp index e4d28df14..99956c4ae 100644 --- a/examples/audiorecorder/audiorecorder.cpp +++ b/examples/audiorecorder/audiorecorder.cpp @@ -46,7 +46,7 @@ #include "audiorecorder.h" -#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) || defined(SYMBIAN_S60_3X) +#if defined(Q_WS_MAEMO_6) #include "ui_audiorecorder_small.h" #else #include "ui_audiorecorder.h" diff --git a/examples/audiorecorder/audiorecorder.pro b/examples/audiorecorder/audiorecorder.pro index 9b56a8cd2..5ab3ec951 100644 --- a/examples/audiorecorder/audiorecorder.pro +++ b/examples/audiorecorder/audiorecorder.pro @@ -12,15 +12,9 @@ SOURCES = \ maemo*: { FORMS += audiorecorder_small.ui -}else:symbian:contains(S60_VERSION, 3.2)|contains(S60_VERSION, 3.1){ - DEFINES += SYMBIAN_S60_3X - FORMS += audiorecorder_small.ui }else { FORMS += audiorecorder.ui } -symbian: { - TARGET.CAPABILITY = UserEnvironment ReadDeviceData WriteDeviceData -} target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiorecorder sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro diff --git a/examples/audiorecorder/main.cpp b/examples/audiorecorder/main.cpp index 7dee4f807..aff3604a9 100644 --- a/examples/audiorecorder/main.cpp +++ b/examples/audiorecorder/main.cpp @@ -47,11 +47,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); AudioRecorder recorder; -#ifdef Q_OS_SYMBIAN - recorder.showMaximized(); -#else recorder.show(); -#endif return app.exec(); }; |