diff -r 41300fa6a67c -r f7bc934e204c qmake/generators/symbian/initprojectdeploy_symbian.h --- a/qmake/generators/symbian/initprojectdeploy_symbian.h Tue Feb 02 00:43:10 2010 +0200 +++ b/qmake/generators/symbian/initprojectdeploy_symbian.h Wed Mar 31 11:06:36 2010 +0300 @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -50,7 +50,9 @@ #include #include -#include "epocroot.h" +#define PLUGIN_STUB_DIR "qmakepluginstubs" +#define ROM_DEPLOYMENT_PLATFORM "rom" +#define EMULATOR_DEPLOYMENT_PLATFORM "emulator" struct CopyItem { @@ -71,6 +73,5 @@ const QString &build, QStringList& generatedDirs, QStringList& generatedFiles); -//:QTP:QTPROD-92 Deployment of plugins requires WINSCW build before ARM build -extern void writeSbsDeploymentList(const DeploymentList& depList, QTextStream& t); + #endif // INITPROJECTDEPLOYSYMBIAN_H