From c76e91db9703e36b11f8a1fddefb793d9b0aa374 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Fri, 4 Nov 2011 14:59:38 +0100
Subject: 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>
---
 src/corelib/global/qlibraryinfo.cpp | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'src/corelib/global/qlibraryinfo.cpp')

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();
         }
     }
-- 
cgit v1.2.3