diff -r 64817133cd1d -r 42ba2d16bf40 camerauis/cameraxui/cxengine/src/cxeengine.cpp --- a/camerauis/cameraxui/cxengine/src/cxeengine.cpp Tue Jul 06 14:04:02 2010 +0300 +++ b/camerauis/cameraxui/cxengine/src/cxeengine.cpp Wed Aug 18 09:37:18 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -17,15 +17,23 @@ #include "cxutils.h" #include "cxeengine.h" +#ifdef Q_OS_SYMBIAN #include "cxeenginesymbian.h" - +#else +#include "cxeenginedesktop.h" +#endif // This should be the only exported method -EXPORT_C CxeEngine* CxeEngine::createEngine() +CAMERAX_ENGINE_EXPORT CxeEngine* CxeEngine::createEngine() { CX_DEBUG_ENTER_FUNCTION(); +#ifdef Q_OS_SYMBIAN CxeEngineSymbian *res = new CxeEngineSymbian(); +#else // Q_OS_SYMBIAN + CxeEngineDesktop *res = new CxeEngineDesktop(); +#endif // Q_OS_SYMBIAN + res->construct(); CX_DEBUG_EXIT_FUNCTION(); return res;