diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-07-18 10:32:16 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-18 05:56:15 +0200 |
| commit | 1403a1c7be7892ad4d1c5d04c143a318055fb36b (patch) | |
| tree | 22a4caf3f5a119dcb12874ee72d2a9bb7dd88a55 /src/imports | |
| parent | 7085775a115421e5fbecc02679da1558c5178e84 (diff) | |
Remove some obsolete bits.
They can be updated again later when things are more stable, if needed.
Change-Id: I73bdacdd3d1fd43a60cd3a0c14b925fa9c32ee27
Reviewed-on: http://codereview.qt.nokia.com/1724
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 10 | ||||
| -rw-r--r-- | src/imports/qimportbase.pri | 10 |
2 files changed, 1 insertions, 19 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index b96fa934d..a6b619c92 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -241,8 +241,6 @@ void QDeclarativeCamera::_q_captureFailed(int id, QCameraImageCapture::Error err You can use the \c Camera element to capture images from a camera, and manipulate the capture and processing settings that get applied to the image. - - \note On Symbian, your process requires the \c UserEnvironment capability to use this element. */ /*! @@ -262,14 +260,6 @@ QDeclarativeCamera::QDeclarativeCamera(QDeclarativeItem *parent) : m_isStateSet(false), m_isValid(true) { -#if defined(Q_OS_SYMBIAN) - RProcess thisProcess; - if (!thisProcess.HasCapability(ECapabilityUserEnvironment)) { - qmlInfo(this) << "Camera Element requires UserEnvironment Capability to be successfully used on Symbian"; - m_isValid = false; - return; - } -#endif m_camera = new QCamera(this); m_viewfinderItem = new QGraphicsVideoItem(this); m_camera->setViewfinder(m_viewfinderItem); diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri index 1468674d4..86e9c3df5 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/qimportbase.pri @@ -1,10 +1,9 @@ load(qt_module) -symbian:load(qt_plugin) TEMPLATE = lib CONFIG += qt plugin -win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release +win32|mac:!win32-msvc:!macx-xcode:CONFIG += debug_and_release isEmpty(TARGETPATH) { error("qimportbase.pri: You must provide a TARGETPATH!") @@ -29,10 +28,3 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols load(qt_targets) -wince*:LIBS += $$QMAKE_LIBS_GUI - -symbian: { - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = All -Tcb - load(armcc_warnings) -} |