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 /src/corelib | |
| 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 'src/corelib')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index acacf7c..898b860 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -63,7 +63,7 @@ QT_END_NAMESPACE #endif #ifdef QLIBRARYINFO_EPOCROOT -# include "symbian/epocroot.h" +# include "symbian/epocroot_p.h" #endif #include "qconfig.cpp" @@ -442,7 +442,7 @@ QLibraryInfo::location(LibraryLocation loc) // $${EPOCROOT} is a special case, resolve it similarly to qmake. QRegExp epocrootMatcher(QLatin1String("\\$\\$\\{EPOCROOT\\}")); if ((rep = epocrootMatcher.indexIn(ret)) != -1) - ret.replace(rep, epocrootMatcher.matchedLength(), epocRoot()); + ret.replace(rep, epocrootMatcher.matchedLength(), qt_epocRoot()); #endif config->endGroup(); |