summaryrefslogtreecommitdiffstats
path: root/qmake/meta.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-01-09 19:25:44 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-10 16:16:34 +0100
commit3e4f7ed5ed29c907815f5bae2628e417c340efbc (patch)
tree08facdfcde3ddc9f2d9b185ba93582254f7906fc /qmake/meta.cpp
parentf5bdf7583012ab3f82ff53a5af1ee77ced9e049c (diff)
QMap => QHash
this should make the evaluator quite a lot faster. the total win for qtbase/src is only 6%, though. i made some effort to avoid that output files get randomized. however, i didn't bother to keep debug output sorted. Change-Id: Id9cef4674c0153c11ebbb65cb63bf8c229eb56e3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake/meta.cpp')
-rw-r--r--qmake/meta.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/meta.cpp b/qmake/meta.cpp
index b01c7993cf..f5edff3ceb 100644
--- a/qmake/meta.cpp
+++ b/qmake/meta.cpp
@@ -46,7 +46,7 @@
QT_BEGIN_NAMESPACE
-QMap<QString, QMap<QString, QStringList> > QMakeMetaInfo::cache_vars;
+QHash<QString, QHash<QString, QStringList> > QMakeMetaInfo::cache_vars;
QMakeMetaInfo::QMakeMetaInfo()
{
@@ -140,8 +140,8 @@ QMakeMetaInfo::readLibtoolFile(const QString &f)
dirf = "";
else if(!dirf.isEmpty() && !dirf.endsWith(Option::output_dir))
dirf += Option::dir_sep;
- QMap<QString, QStringList> &v = proj.variables();
- for(QMap<QString, QStringList>::Iterator it = v.begin(); it != v.end(); ++it) {
+ QHash<QString, QStringList> &v = proj.variables();
+ for(QHash<QString, QStringList>::Iterator it = v.begin(); it != v.end(); ++it) {
QStringList lst = it.value();
if(lst.count() == 1 && (lst.first().startsWith("'") || lst.first().startsWith("\"")) &&
lst.first().endsWith(QString(lst.first()[0])))