diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-04-28 07:53:30 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-04-28 07:53:30 (GMT) |
| commit | da6f674fcdb0995d44e99ea8a82392d2b3f7b69c (patch) | |
| tree | c73bd218620bc3708c268c48370d8a276c59eae3 /qmake | |
| parent | a10e5b8102abde1f3edff44f24d8fcdcab859393 (diff) | |
| download | Qt-da6f674fcdb0995d44e99ea8a82392d2b3f7b69c.zip Qt-da6f674fcdb0995d44e99ea8a82392d2b3f7b69c.tar.gz Qt-da6f674fcdb0995d44e99ea8a82392d2b3f7b69c.tar.bz2 | |
Re-enabled winscw target for non-OS_WIN builds.
Diffstat (limited to 'qmake')
| -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 |