--- a/camerauis/cameraxui/cxengine/src/cxeengine.cpp	Thu Jul 15 01:55:05 2010 +0300
+++ b/camerauis/cameraxui/cxengine/src/cxeengine.cpp	Fri Jul 23 11:35:41 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;