X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=qmake%2Fmeta.h;h=57591a21db364a4cc98086a739d092a495629e0b;hb=d46198e74db770d481357ca509b9228b3f7b84d0;hp=32ca5ed4a642de9b3137cc0b8fc0833b774c1f50;hpb=6bd691dc5402f22840a3354b08cb6bdc99b01006;p=profile%2Fivi%2Fqtbase.git

diff --git a/qmake/meta.h b/qmake/meta.h
index 32ca5ed..57591a2 100644
--- a/qmake/meta.h
+++ b/qmake/meta.h
@@ -1,38 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the qmake application of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
 ** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
 **
 **
 ** $QT_END_LICENSE$
@@ -42,57 +42,62 @@
 #ifndef META_H
 #define META_H
 
-#include <qmap.h>
+#include "project.h"
+
+#include <qhash.h>
 #include <qstringlist.h>
 #include <qstring.h>
 
 QT_BEGIN_NAMESPACE
 
+class QMakeProject;
+
 class QMakeMetaInfo
 {
     bool readLibtoolFile(const QString &f);
     bool readPkgCfgFile(const QString &f);
-    QMap<QString, QStringList> vars;
+    QMakeProject *conf;
+    ProValueMap vars;
     QString meta_type;
-    static QMap<QString, QMap<QString, QStringList> > cache_vars;
+    static QHash<QString, ProValueMap> cache_vars;
     void clear();
 public:
-    QMakeMetaInfo();
+    QMakeMetaInfo(QMakeProject *_conf);
 
     bool readLib(QString lib);
     static QString findLib(QString lib);
     static bool libExists(QString lib);
     QString type() const;
 
-    bool isEmpty(const QString &v);
-    QStringList &values(const QString &v);
-    QString first(const QString &v);
-    QMap<QString, QStringList> &variables();
+    bool isEmpty(const ProKey &v);
+    ProStringList &values(const ProKey &v);
+    ProString first(const ProKey &v);
+    ProValueMap &variables();
 };
 
-inline bool QMakeMetaInfo::isEmpty(const QString &v)
+inline bool QMakeMetaInfo::isEmpty(const ProKey &v)
 { return !vars.contains(v) || vars[v].isEmpty(); }
 
 inline QString QMakeMetaInfo::type() const
 { return meta_type; }
 
-inline QStringList &QMakeMetaInfo::values(const QString &v)
+inline ProStringList &QMakeMetaInfo::values(const ProKey &v)
 { return vars[v]; }
 
-inline QString QMakeMetaInfo::first(const QString &v)
+inline ProString QMakeMetaInfo::first(const ProKey &v)
 {
 #if defined(Q_CC_SUN) && (__SUNPRO_CC == 0x500) || defined(Q_CC_HP)
     // workaround for Sun WorkShop 5.0 bug fixed in Forte 6
     if (isEmpty(v))
-        return QString("");
+        return ProString("");
     else
         return vars[v].first();
 #else
-    return isEmpty(v) ? QString("") : vars[v].first();
+    return isEmpty(v) ? ProString("") : vars[v].first();
 #endif
 }
 
-inline QMap<QString, QStringList> &QMakeMetaInfo::variables()
+inline ProValueMap &QMakeMetaInfo::variables()
 { return vars; }
 
 inline bool QMakeMetaInfo::libExists(QString lib)