diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2011-11-04 14:59:38 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-07 13:26:41 +0100 |
| commit | c76e91db9703e36b11f8a1fddefb793d9b0aa374 (patch) | |
| tree | aa358ff91a3749de51bbbb60c7f75ed574f05d05 /src | |
| parent | 981dd3b3147df213608981d347c998dcf0230fe1 (diff) | |
symbian epoc root code removed
Change-Id: Ibc9f5e42c534a09a8a44a0c95789f467970d38a2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/global.pri | 7 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 11 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index b24c68a097..3c0dfd2a39 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -25,10 +25,3 @@ linux*:!cross_compile:!static:!symbian-gcce:!*-armcc* { DEFINES += ELF_INTERPRETER=\\\"$$system(readelf -l /bin/ls | perl -n -e \'$$prog\')\\\" } -# Compensate for lack of platform defines in Symbian3 and Symbian4 -symbian { - DEFINES += SYMBIAN_VERSION_$$upper($$replace(SYMBIAN_VERSION,\\.,_)) \ - S60_VERSION_$$upper($$replace(S60_VERSION,\\.,_)) -} - -include(../../../tools/shared/symbian/epocroot.pri) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index d70c77afae..a89e6edca1 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -62,10 +62,6 @@ QT_END_NAMESPACE # include "private/qcore_mac_p.h" #endif -#ifdef QLIBRARYINFO_EPOCROOT -# include "symbian/epocroot_p.h" -#endif - #include "qconfig.cpp" QT_BEGIN_NAMESPACE @@ -415,13 +411,6 @@ QLibraryInfo::location(LibraryLocation loc) reg_var.matchedLength() - 3).toLatin1().constData()).constData())); } -#ifdef QLIBRARYINFO_EPOCROOT - // $${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(), qt_epocRoot()); -#endif - config->endGroup(); } } |