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>
This commit is contained in:
committed by
Qt by Nokia
parent
7085775a11
commit
1403a1c7be
@@ -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);
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user