diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-04-28 08:03:44 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-04-28 08:03:44 (GMT) |
| commit | 08dc54fe49288486b989bd8f823ecdbf3454d47e (patch) | |
| tree | 84ecdd7eb9745876f5a7b05256179ae07fb260c5 | |
| parent | 949ad6f6607783aace78f2fbf9c9632a39c37337 (diff) | |
| parent | 64a4d0e36d65712a4041d376bd5ba982642efd04 (diff) | |
| download | Qt-08dc54fe49288486b989bd8f823ecdbf3454d47e.zip Qt-08dc54fe49288486b989bd8f823ecdbf3454d47e.tar.gz Qt-08dc54fe49288486b989bd8f823ecdbf3454d47e.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 541226f..fe25dd0 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -73,9 +73,6 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo QStringList debugPlatforms = allPlatforms; QStringList releasePlatforms = allPlatforms; releasePlatforms.removeAll("winscw"); // No release for emulator -#if !defined(Q_OS_WIN) - debugPlatforms.removeAll("winscw"); // Winscw is only for windows -#endif bool isSubdirs = getTargetExtension() == "subdirs"; @@ -344,7 +341,6 @@ bool SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t t << endl; -#if defined(Q_OS_WIN) // Write winscw deployment rules QString remoteTestPath = epocRoot() + QLatin1String("epoc32/winscw/c/private/") + privateDirUid; DeploymentList depList; @@ -356,7 +352,10 @@ bool SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t QString fromItem = depList.at(i).from; QString toItem = depList.at(i).to; fromItem.replace("\\", "/"); - toItem.replace("\\", "/").prepend(QDir::current().absolutePath().left(2)); // add drive + toItem.replace("\\", "/"); +#if defined(Q_OS_WIN) + toItem.prepend(QDir::current().absolutePath().left(2)); // add drive +#endif t << "OPTION DEPLOY_SOURCE " << fromItem << endl; t << "OPTION DEPLOY_TARGET " << toItem << endl; t << "END" << endl; @@ -364,7 +363,6 @@ bool SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t t << "#endif" << endl; t << endl; -#endif // ### TODO: Linux emulator (platsim?) deployment |