summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2011-07-19 10:40:05 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-19 03:06:23 +0200
commiteccb43d73c08b85bab89d8f632d423b63592e14f (patch)
treee16b44f1548a48f49b64c58263dd067b67232a8e /examples
parent1403a1c7be7892ad4d1c5d04c143a318055fb36b (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')
-rw-r--r--examples/audiodevices/audiodevices.pro4
-rw-r--r--examples/audiodevices/main.cpp4
-rw-r--r--examples/audiorecorder/audiorecorder.cpp2
-rw-r--r--examples/audiorecorder/audiorecorder.pro6
-rw-r--r--examples/audiorecorder/main.cpp4
-rw-r--r--examples/camera/camera.cpp2
-rw-r--r--examples/camera/camera.pro7
-rw-r--r--examples/camera/camerakeyevent_symbian/camerakeyevent_symbian.cpp101
-rw-r--r--examples/camera/camerakeyevent_symbian/camerakeyevent_symbian.h87
-rw-r--r--examples/camera/camerakeyevent_symbian/camerakeyevent_symbian.pri7
-rw-r--r--examples/camera/main.cpp21
-rw-r--r--examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.cpp101
-rw-r--r--examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.h87
-rw-r--r--examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.pri7
-rw-r--r--examples/declarative-camera/declarative-camera.pro13
-rw-r--r--examples/declarative-camera/qmlcamera.cpp13
-rw-r--r--examples/player/main.cpp2
-rw-r--r--examples/player/player.cpp16
-rw-r--r--examples/player/player.pro5
-rw-r--r--examples/player/playercontrols.cpp2
-rw-r--r--examples/player/videowidget.cpp12
-rw-r--r--examples/radio/main.cpp4
-rw-r--r--examples/radio/radio.cpp20
-rw-r--r--examples/radio/radio.pro4
-rw-r--r--examples/slideshow/main.cpp4
-rw-r--r--examples/slideshow/slideshow.pro5
-rw-r--r--examples/spectrum/3rdparty/fftreal/fftreal.pro8
-rw-r--r--examples/spectrum/app/app.pro72
-rw-r--r--examples/spectrum/app/main.cpp4
-rw-r--r--examples/spectrum/app/mainwidget.cpp5
-rw-r--r--examples/spectrum/spectrum.pro9
-rw-r--r--examples/videographicsitem/videographicsitem.pro2
-rw-r--r--examples/videographicsitem/videoplayer.cpp4
33 files changed, 36 insertions, 608 deletions
diff --git a/examples/audiodevices/audiodevices.pro b/examples/audiodevices/audiodevices.pro
index e7904f5a9..3b77ec21b 100644
--- a/examples/audiodevices/audiodevices.pro
+++ b/examples/audiodevices/audiodevices.pro
@@ -10,10 +10,6 @@ SOURCES = audiodevices.cpp \
FORMS += audiodevicesbase.ui
-symbian {
- TARGET.CAPABILITY = UserEnvironment WriteDeviceData ReadDeviceData
-}
-
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiodevices
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiodevices
diff --git a/examples/audiodevices/main.cpp b/examples/audiodevices/main.cpp
index 451be57b9..7ba26ea16 100644
--- a/examples/audiodevices/main.cpp
+++ b/examples/audiodevices/main.cpp
@@ -48,11 +48,7 @@ int main(int argv, char **args)
app.setApplicationName("Audio Device Test");
AudioTest audio;
-#ifdef Q_OS_SYMBIAN
- audio.showMaximized();
-#else
audio.show();
-#endif
return app.exec();
}
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();
};
diff --git a/examples/camera/camera.cpp b/examples/camera/camera.cpp
index ab8ebf33d..2fe658ae8 100644
--- a/examples/camera/camera.cpp
+++ b/examples/camera/camera.cpp
@@ -53,7 +53,7 @@
#include <QtGui>
-#if (defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)) && QT_VERSION >= 0x040700
+#if (defined(Q_WS_MAEMO_6)) && QT_VERSION >= 0x040700
#define HAVE_CAMERA_BUTTONS
#endif
diff --git a/examples/camera/camera.pro b/examples/camera/camera.pro
index 6ec82caf5..caa58cb77 100644
--- a/examples/camera/camera.pro
+++ b/examples/camera/camera.pro
@@ -19,13 +19,6 @@ FORMS += \
videosettings.ui \
imagesettings.ui
-symbian {
- include(camerakeyevent_symbian/camerakeyevent_symbian.pri)
- TARGET.CAPABILITY += UserEnvironment WriteUserData ReadUserData
- TARGET.EPOCHEAPSIZE = 0x20000 0x3000000
- LIBS += -lavkon -leiksrv -lcone -leikcore
-}
-
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera
diff --git a/examples/camera/camerakeyevent_symbian/camerakeyevent_symbian.cpp b/examples/camera/camerakeyevent_symbian/camerakeyevent_symbian.cpp
deleted file mode 100644
index 30723af40..000000000
--- a/examples/camera/camerakeyevent_symbian/camerakeyevent_symbian.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "camerakeyevent_symbian.h"
-
-#include <QtGui/QWidget> // WId
-#include <eikon.hrh> // EKeyCamera
-#include <coecntrl.h> // CCoeControl (WId)
-#include <w32std.h> // RWindowbase, RWindowGroup, RWsSession
-
-QSymbianCameraKeyListener::QSymbianCameraKeyListener(QWidget *widget):
- QObject(widget),
- m_widget(widget)
-{
- if (!m_widget)
- return;
-
- // Get view's native Symbian window
- WId windowId = 0;
- if (m_widget->internalWinId())
- windowId = m_widget->internalWinId();
- else if (m_widget->parentWidget() && m_widget->effectiveWinId())
- windowId = m_widget->effectiveWinId();
- RWindowBase *window = windowId ? static_cast<RWindowBase*>(windowId->DrawableWindow()) : 0;
-
- // Get hold of the window group
- TInt wGroupId = window ? window->WindowGroupId() : 0;
- if (!wGroupId)
- return;
- RWsSession &wsSession = CCoeEnv::Static()->WsSession();
- TUint wGroupHandle = wsSession.GetWindowGroupHandle(wGroupId);
- if (wGroupHandle) {
- RWindowGroup wGroup(wsSession);
- wGroup.Construct(wGroupHandle);
- if (wGroup.CaptureKey(EKeyCamera, 0, 0, 100) < 0)
- qWarning("Unable to register for camera capture key events, SwEvent capability may be missing");
- }
-}
-
-QSymbianCameraKeyListener::~QSymbianCameraKeyListener()
-{
- if (!m_widget)
- return;
-
- // Get view's native Symbian window
- WId windowId = 0;
- if (m_widget->internalWinId())
- windowId = m_widget->internalWinId();
- else if (m_widget->parentWidget() && m_widget->effectiveWinId())
- windowId = m_widget->effectiveWinId();
- RWindowBase *window = windowId ? static_cast<RWindowBase*>(windowId->DrawableWindow()) : 0;
-
- // Get hold of the window group
- TInt wGroupId = window ? window->WindowGroupId() : 0;
- if (!wGroupId)
- return;
- RWsSession &wsSession = CCoeEnv::Static()->WsSession();
- TUint wGroupHandle = wsSession.GetWindowGroupHandle(wGroupId);
- if (wGroupHandle) {
- RWindowGroup wGroup(wsSession);
- wGroup.Construct(wGroupHandle);
- wGroup.CancelCaptureKey(EKeyCamera);
- }
-}
diff --git a/examples/camera/camerakeyevent_symbian/camerakeyevent_symbian.h b/examples/camera/camerakeyevent_symbian/camerakeyevent_symbian.h
deleted file mode 100644
index 4cd5701b9..000000000
--- a/examples/camera/camerakeyevent_symbian/camerakeyevent_symbian.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef CAMERAKEYEVENT_SYMBIAN_H
-#define CAMERAKEYEVENT_SYMBIAN_H
-
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
- * Description:
- * This header can be used to register application on Symbian platforms
- * for the Camera capture button key events. Application can avoid native
- * camera application from starting by not forwarding the key event.
- *
- * Usage:
- * Application needs to include this header and include the needed Symbian
- * libraries. Optionally application can include camerakeyevent_symbian.pri
- * file. Application can register and unregister for the Camera capture
- * key events by creating/destructing the QSymbianCameraKeyListener helper
- * object. The widget needs to be shown before it registers for the
- * Camera key event.
- *
- * Libraries needed:
- * User needs to define following in the .pro file (or optionally include
- * the camerakeyevent_symbian.pri):
- * LIBS += -lcone -lws32
- *
- * Symbian Capabilities needed:
- * To use this header user needs to have SwEvent capability (included in
- * the camerakeyevent_symbian.pri):
- * TARGET.CAPABILITY += SwEvent
- */
-
-#include <QtCore/QObject>
-
-QT_BEGIN_NAMESPACE
-QT_FORWARD_DECLARE_CLASS(QWidget)
-QT_END_NAMESPACE
-
-QT_USE_NAMESPACE
-
-class QSymbianCameraKeyListener : public QObject
-{
- Q_OBJECT
-public:
- QSymbianCameraKeyListener(QWidget *parent = 0);
- ~QSymbianCameraKeyListener();
-private:
- QWidget *m_widget;
-};
-
-#endif // CAMERAKEYEVENT_SYMBIAN_H
diff --git a/examples/camera/camerakeyevent_symbian/camerakeyevent_symbian.pri b/examples/camera/camerakeyevent_symbian/camerakeyevent_symbian.pri
deleted file mode 100644
index 097c3b245..000000000
--- a/examples/camera/camerakeyevent_symbian/camerakeyevent_symbian.pri
+++ /dev/null
@@ -1,7 +0,0 @@
-message("camerakeyevent_symbian: Including Symbian camera capture key event register methods")
-
-HEADERS += $$PWD/camerakeyevent_symbian.h
-SOURCES += $$PWD/camerakeyevent_symbian.cpp
-INCLUDEPATH += $$PWD
-LIBS *= -lcone -lws32
-TARGET.CAPABILITY *= SwEvent
diff --git a/examples/camera/main.cpp b/examples/camera/main.cpp
index 7fd9a61f7..de55437c3 100644
--- a/examples/camera/main.cpp
+++ b/examples/camera/main.cpp
@@ -39,34 +39,15 @@
****************************************************************************/
#include "camera.h"
-#ifdef Q_OS_SYMBIAN
-#include "camerakeyevent_symbian.h"
-#endif // Q_OS_SYMBIAN
#include <QtGui>
int main(int argc, char *argv[])
{
-#if defined (Q_OS_SYMBIAN)
- QApplication::setGraphicsSystem("raster");
QApplication app(argc, argv);
- // lock orientation before constructing camera
- CAknAppUi* appUi = dynamic_cast<CAknAppUi*>(CEikonEnv::Static()->AppUi());
- if(appUi){
- QT_TRAP_THROWING(appUi ->SetOrientationL(CAknAppUi::EAppUiOrientationLandscape));
- }
-#else
- QApplication app(argc, argv);
-#endif
Camera camera;
-
-#ifdef Q_OS_SYMBIAN
- camera.showMaximized();
- new QSymbianCameraKeyListener(&camera);
-#else
camera.show();
-#endif
-
+
return app.exec();
};
diff --git a/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.cpp b/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.cpp
deleted file mode 100644
index 30723af40..000000000
--- a/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "camerakeyevent_symbian.h"
-
-#include <QtGui/QWidget> // WId
-#include <eikon.hrh> // EKeyCamera
-#include <coecntrl.h> // CCoeControl (WId)
-#include <w32std.h> // RWindowbase, RWindowGroup, RWsSession
-
-QSymbianCameraKeyListener::QSymbianCameraKeyListener(QWidget *widget):
- QObject(widget),
- m_widget(widget)
-{
- if (!m_widget)
- return;
-
- // Get view's native Symbian window
- WId windowId = 0;
- if (m_widget->internalWinId())
- windowId = m_widget->internalWinId();
- else if (m_widget->parentWidget() && m_widget->effectiveWinId())
- windowId = m_widget->effectiveWinId();
- RWindowBase *window = windowId ? static_cast<RWindowBase*>(windowId->DrawableWindow()) : 0;
-
- // Get hold of the window group
- TInt wGroupId = window ? window->WindowGroupId() : 0;
- if (!wGroupId)
- return;
- RWsSession &wsSession = CCoeEnv::Static()->WsSession();
- TUint wGroupHandle = wsSession.GetWindowGroupHandle(wGroupId);
- if (wGroupHandle) {
- RWindowGroup wGroup(wsSession);
- wGroup.Construct(wGroupHandle);
- if (wGroup.CaptureKey(EKeyCamera, 0, 0, 100) < 0)
- qWarning("Unable to register for camera capture key events, SwEvent capability may be missing");
- }
-}
-
-QSymbianCameraKeyListener::~QSymbianCameraKeyListener()
-{
- if (!m_widget)
- return;
-
- // Get view's native Symbian window
- WId windowId = 0;
- if (m_widget->internalWinId())
- windowId = m_widget->internalWinId();
- else if (m_widget->parentWidget() && m_widget->effectiveWinId())
- windowId = m_widget->effectiveWinId();
- RWindowBase *window = windowId ? static_cast<RWindowBase*>(windowId->DrawableWindow()) : 0;
-
- // Get hold of the window group
- TInt wGroupId = window ? window->WindowGroupId() : 0;
- if (!wGroupId)
- return;
- RWsSession &wsSession = CCoeEnv::Static()->WsSession();
- TUint wGroupHandle = wsSession.GetWindowGroupHandle(wGroupId);
- if (wGroupHandle) {
- RWindowGroup wGroup(wsSession);
- wGroup.Construct(wGroupHandle);
- wGroup.CancelCaptureKey(EKeyCamera);
- }
-}
diff --git a/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.h b/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.h
deleted file mode 100644
index 4cd5701b9..000000000
--- a/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef CAMERAKEYEVENT_SYMBIAN_H
-#define CAMERAKEYEVENT_SYMBIAN_H
-
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
- * Description:
- * This header can be used to register application on Symbian platforms
- * for the Camera capture button key events. Application can avoid native
- * camera application from starting by not forwarding the key event.
- *
- * Usage:
- * Application needs to include this header and include the needed Symbian
- * libraries. Optionally application can include camerakeyevent_symbian.pri
- * file. Application can register and unregister for the Camera capture
- * key events by creating/destructing the QSymbianCameraKeyListener helper
- * object. The widget needs to be shown before it registers for the
- * Camera key event.
- *
- * Libraries needed:
- * User needs to define following in the .pro file (or optionally include
- * the camerakeyevent_symbian.pri):
- * LIBS += -lcone -lws32
- *
- * Symbian Capabilities needed:
- * To use this header user needs to have SwEvent capability (included in
- * the camerakeyevent_symbian.pri):
- * TARGET.CAPABILITY += SwEvent
- */
-
-#include <QtCore/QObject>
-
-QT_BEGIN_NAMESPACE
-QT_FORWARD_DECLARE_CLASS(QWidget)
-QT_END_NAMESPACE
-
-QT_USE_NAMESPACE
-
-class QSymbianCameraKeyListener : public QObject
-{
- Q_OBJECT
-public:
- QSymbianCameraKeyListener(QWidget *parent = 0);
- ~QSymbianCameraKeyListener();
-private:
- QWidget *m_widget;
-};
-
-#endif // CAMERAKEYEVENT_SYMBIAN_H
diff --git a/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.pri b/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.pri
deleted file mode 100644
index 097c3b245..000000000
--- a/examples/declarative-camera/camerakeyevent_symbian/camerakeyevent_symbian.pri
+++ /dev/null
@@ -1,7 +0,0 @@
-message("camerakeyevent_symbian: Including Symbian camera capture key event register methods")
-
-HEADERS += $$PWD/camerakeyevent_symbian.h
-SOURCES += $$PWD/camerakeyevent_symbian.cpp
-INCLUDEPATH += $$PWD
-LIBS *= -lcone -lws32
-TARGET.CAPABILITY *= SwEvent
diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro
index 22112bf30..455ea6298 100644
--- a/examples/declarative-camera/declarative-camera.pro
+++ b/examples/declarative-camera/declarative-camera.pro
@@ -3,10 +3,8 @@ TEMPLATE=app
QT += declarative qtquick1 network multimediakit
-!maemo5 {
- contains(QT_CONFIG, opengl) {
- QT += opengl
- }
+contains(QT_CONFIG, opengl) {
+ QT += opengl
}
SOURCES += $$PWD/qmlcamera.cpp
@@ -15,13 +13,6 @@ else:TARGET = QmlCamera
RESOURCES += declarative-camera.qrc
-symbian {
- include(camerakeyevent_symbian/camerakeyevent_symbian.pri)
- load(data_caging_paths)
- TARGET.CAPABILITY += UserEnvironment NetworkServices Location ReadUserData WriteUserData
- TARGET.EPOCHEAPSIZE = 0x20000 0x3000000
-}
-
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera
diff --git a/examples/declarative-camera/qmlcamera.cpp b/examples/declarative-camera/qmlcamera.cpp
index 8494e3feb..409b46440 100644
--- a/examples/declarative-camera/qmlcamera.cpp
+++ b/examples/declarative-camera/qmlcamera.cpp
@@ -47,14 +47,10 @@
#include <QtOpenGL/QGLWidget>
#endif
-#ifdef Q_OS_SYMBIAN
-#include "camerakeyevent_symbian.h"
-#endif // Q_OS_SYMBIAN
-
int main(int argc, char *argv[])
{
-#if defined (Q_WS_X11) || defined (Q_WS_MAC) || defined (Q_OS_SYMBIAN)
+#if defined (Q_WS_X11) || defined (Q_WS_MAC)
//### default to using raster graphics backend for now
bool gsSpecified = false;
for (int i = 0; i < argc; ++i) {
@@ -72,7 +68,7 @@ int main(int argc, char *argv[])
QApplication application(argc, argv);
const QString mainQmlApp = QLatin1String("qrc:/declarative-camera.qml");
QDeclarativeView view;
-#if !defined(QT_NO_OPENGL) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_S60)
+#if !defined(QT_NO_OPENGL)
view.setViewport(new QGLWidget);
#endif
view.setSource(QUrl(mainQmlApp));
@@ -80,12 +76,9 @@ int main(int argc, char *argv[])
// Qt.quit() called in embedded .qml by default only emits
// quit() signal, so do this (optionally use Qt.exit()).
QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit()));
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6)
view.setGeometry(application.desktop()->screenGeometry());
view.showFullScreen();
-#ifdef Q_OS_SYMBIAN
- new QSymbianCameraKeyListener(&view);
-#endif // Q_OS_SYMBIAN
#else
view.setGeometry(QRect(100, 100, 800, 480));
view.show();
diff --git a/examples/player/main.cpp b/examples/player/main.cpp
index 403a085f0..d2de33b0c 100644
--- a/examples/player/main.cpp
+++ b/examples/player/main.cpp
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
Player player;
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
+#if defined(Q_WS_SIMULATOR)
# if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 2))
player.setAttribute(Qt::WA_LockLandscapeOrientation);
# else
diff --git a/examples/player/player.cpp b/examples/player/player.cpp
index 8fa387916..49c160ee0 100644
--- a/examples/player/player.cpp
+++ b/examples/player/player.cpp
@@ -182,14 +182,7 @@ Player::~Player()
void Player::open()
{
-#ifdef Q_WS_MAEMO_5
- QStringList fileNames;
- QString fileName = QFileDialog::getOpenFileName(this, tr("Open Files"), "/");
- if (!fileName.isEmpty())
- fileNames << fileName;
-#else
QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Open Files"));
-#endif
addToPlaylist(fileNames);
}
@@ -405,25 +398,16 @@ void Player::showColorDialog()
connect(saturationSlider, SIGNAL(sliderMoved(int)), videoWidget, SLOT(setSaturation(int)));
connect(videoWidget, SIGNAL(saturationChanged(int)), saturationSlider, SLOT(setValue(int)));
-#if defined(Q_OS_SYMBIAN)
- QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok);
-#endif
QFormLayout *layout = new QFormLayout;
layout->addRow(tr("Brightness"), brightnessSlider);
layout->addRow(tr("Contrast"), contrastSlider);
layout->addRow(tr("Hue"), hueSlider);
layout->addRow(tr("Saturation"), saturationSlider);
-#if defined(Q_OS_SYMBIAN)
- layout->addWidget(buttonBox);
-#endif
QPushButton *button = new QPushButton(tr("Close"));
layout->addRow(button);
colorDialog = new QDialog(this);
-#if defined(Q_OS_SYMBIAN)
- connect(buttonBox, SIGNAL(clicked(QAbstractButton*)), colorDialog, SLOT(hide()));
-#endif
colorDialog->setWindowTitle(tr("Color Options"));
colorDialog->setLayout(layout);
diff --git a/examples/player/player.pro b/examples/player/player.pro
index c22066dc2..687779f0f 100644
--- a/examples/player/player.pro
+++ b/examples/player/player.pro
@@ -22,11 +22,6 @@ maemo* {
DEFINES += PLAYER_NO_COLOROPTIONS
}
-symbian {
- LIBS += -lavkon -lcone -leikcore
- TARGET.CAPABILITY = ReadUserData
-}
-
#install
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro
diff --git a/examples/player/playercontrols.cpp b/examples/player/playercontrols.cpp
index bf4d96b2f..b4f623beb 100644
--- a/examples/player/playercontrols.cpp
+++ b/examples/player/playercontrols.cpp
@@ -84,7 +84,6 @@ PlayerControls::PlayerControls(QWidget *parent)
connect(muteButton, SIGNAL(clicked()), this, SLOT(muteClicked()));
-#ifndef Q_WS_MAEMO_5
volumeSlider = new QSlider(Qt::Horizontal, this);
volumeSlider->setRange(0, 100);
@@ -98,7 +97,6 @@ PlayerControls::PlayerControls(QWidget *parent)
rateBox->setCurrentIndex(1);
connect(rateBox, SIGNAL(activated(int)), SLOT(updateRate()));
-#endif
QBoxLayout *layout = new QHBoxLayout;
layout->setMargin(0);
diff --git a/examples/player/videowidget.cpp b/examples/player/videowidget.cpp
index 46f1b33ff..87c9455d6 100644
--- a/examples/player/videowidget.cpp
+++ b/examples/player/videowidget.cpp
@@ -56,11 +56,6 @@ VideoWidget::VideoWidget(QWidget *parent)
void VideoWidget::keyPressEvent(QKeyEvent *event)
{
-#ifdef Q_OS_SYMBIAN
- if (isFullScreen())
- setFullScreen(false);
-#endif
-
if (event->key() == Qt::Key_Escape && isFullScreen()) {
showNormal();
@@ -83,13 +78,6 @@ void VideoWidget::mouseDoubleClickEvent(QMouseEvent *event)
void VideoWidget::mousePressEvent(QMouseEvent *event)
{
-#ifdef Q_WS_MAEMO_5
- if (isFullScreen())
- setFullScreen(false);
-
- event->accept();
-#else
QVideoWidget::mousePressEvent(event);
-#endif
}
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
diff --git a/examples/slideshow/main.cpp b/examples/slideshow/main.cpp
index 665c0490d..cd31372af 100644
--- a/examples/slideshow/main.cpp
+++ b/examples/slideshow/main.cpp
@@ -47,11 +47,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
SlideShow slideShow;
-#ifdef Q_OS_SYMBIAN
- slideShow.showMaximized();
-#else
slideShow.show();
-#endif
return app.exec();
}
diff --git a/examples/slideshow/slideshow.pro b/examples/slideshow/slideshow.pro
index e969ade66..017addd7a 100644
--- a/examples/slideshow/slideshow.pro
+++ b/examples/slideshow/slideshow.pro
@@ -10,11 +10,6 @@ SOURCES = \
main.cpp \
slideshow.cpp
-symbian {
- TARGET.CAPABILITY = NetworkServices
- TARGET.EPOCHEAPSIZE = 0x20000 0x3000000
-}
-
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/slideshow
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/slideshow
diff --git a/examples/spectrum/3rdparty/fftreal/fftreal.pro b/examples/spectrum/3rdparty/fftreal/fftreal.pro
index 6c0ecbf4c..2c667ef76 100644
--- a/examples/spectrum/3rdparty/fftreal/fftreal.pro
+++ b/examples/spectrum/3rdparty/fftreal/fftreal.pro
@@ -31,16 +31,10 @@ SOURCES += fftreal_wrapper.cpp
DEFINES += FFTREAL_LIBRARY
-symbian {
- # Provide unique ID for the generated binary, required by Symbian OS
- TARGET.UID3 = 0xA000E403
- TARGET.CAPABILITY = UserEnvironment
-}
-
macx {
CONFIG += lib_bundle
} else {
- !symbian: DESTDIR = ../..$${spectrum_build_dir}
+ DESTDIR = ../..$${spectrum_build_dir}
}
# Install
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)
diff --git a/examples/spectrum/spectrum.pro b/examples/spectrum/spectrum.pro
index e5113be6d..43e04664b 100644
--- a/examples/spectrum/spectrum.pro
+++ b/examples/spectrum/spectrum.pro
@@ -13,15 +13,6 @@ SUBDIRS += app
TARGET = spectrum
-symbian {
- # Create a 'make sis' rule which can be run from the top-level
-
- CONFIG += qt_demo
-
- # UID for the SIS file
- TARGET.UID3 = 0xA000E402
-}
-
sources.files = README.txt spectrum.pri spectrum.pro TODO.txt
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum
INSTALLS += sources
diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro
index 4738dfa64..4924ab551 100644
--- a/examples/videographicsitem/videographicsitem.pro
+++ b/examples/videographicsitem/videographicsitem.pro
@@ -3,7 +3,7 @@ TARGET = videographicsitem
QT += multimediakit
-!symbian:contains(QT_CONFIG, opengl): QT += opengl
+contains(QT_CONFIG, opengl): QT += opengl
HEADERS += videoplayer.h \
videoitem.h
diff --git a/examples/videographicsitem/videoplayer.cpp b/examples/videographicsitem/videoplayer.cpp
index 48df7f36b..14e591fc4 100644
--- a/examples/videographicsitem/videoplayer.cpp
+++ b/examples/videographicsitem/videoplayer.cpp
@@ -44,7 +44,7 @@
#include <QtGui>
#include <qvideosurfaceformat.h>
-#if !defined(QT_NO_OPENGL) && !defined(Q_OS_SYMBIAN)
+#if !defined(QT_NO_OPENGL)
# include <QtOpenGL/QGLWidget>
#endif
@@ -60,7 +60,7 @@ VideoPlayer::VideoPlayer(QWidget *parent, Qt::WindowFlags flags)
QGraphicsScene *scene = new QGraphicsScene(this);
QGraphicsView *graphicsView = new QGraphicsView(scene);
-#if !defined(QT_NO_OPENGL) && !defined(Q_OS_SYMBIAN)
+#if !defined(QT_NO_OPENGL)
graphicsView->setViewport(new QGLWidget);
#endif