diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-19 12:53:29 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-19 13:35:00 (GMT) |
| commit | 4b380543cc973d575a3ed0c77918adbe5b6133f0 (patch) | |
| tree | d7f618d55549f46a9b9bbb974d2ee7ad7a838183 /qmake/generators/symbian/symmake_abld.cpp | |
| parent | 45ffd89f55a7769c66f6cf15e54994a264012f05 (diff) | |
| download | Qt-4b380543cc973d575a3ed0c77918adbe5b6133f0.zip Qt-4b380543cc973d575a3ed0c77918adbe5b6133f0.tar.gz Qt-4b380543cc973d575a3ed0c77918adbe5b6133f0.tar.bz2 | |
Fixed namespace issues related to epocroot.cpp
Task-number: QTBUG-15393
Reviewed-by: axis
Diffstat (limited to 'qmake/generators/symbian/symmake_abld.cpp')
| -rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index 7059a52..cd64325 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -49,7 +49,7 @@ #include <qdebug.h> // Included from tools/shared -#include <symbian/epocroot.h> +#include <symbian/epocroot_p.h> #define DO_NOTHING_TARGET "do_nothing" #define CREATE_TEMPS_TARGET "create_temps" @@ -431,7 +431,7 @@ bool SymbianAbldMakefileGenerator::writeDeploymentTargets(QTextStream &t, bool i else t << WINSCW_DEPLOYMENT_TARGET ":" << endl; - QString remoteTestPath = epocRoot() + QString remoteTestPath = qt_epocRoot() + QDir::toNativeSeparators(QLatin1String(isRom ? "epoc32/data/z/private/" : "epoc32/winscw/c/private/")) + privateDirUid; |