diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-04 21:32:40 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-03-04 21:45:05 +0100 |
| commit | 96232be1466e8c059c270b611ce7c32997ff60a9 (patch) | |
| tree | 9bf47c0c2c84556415eee7f938a098ae7e542649 /qmake/property.h | |
| parent | 8db8a34f07a2f8cbd06dc0b593886a13d52ae4b1 (diff) | |
| parent | fb8c95bac09910c4dfa476ab97c6206b2e94ee53 (diff) | |
Merge remote-tracking branch 'origin/api_changes'
Conflicts:
dist/changes-5.0.0
mkspecs/features/qt_module_config.prf
qmake/project.cpp
qmake/property.cpp
Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296
Diffstat (limited to 'qmake/property.h')
| -rw-r--r-- | qmake/property.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/property.h b/qmake/property.h index d67d0ad09d..6195e482fb 100644 --- a/qmake/property.h +++ b/qmake/property.h @@ -44,6 +44,7 @@ #include <qglobal.h> #include <qstring.h> +#include <qhash.h> QT_BEGIN_NAMESPACE @@ -55,6 +56,9 @@ class QMakeProperty void initSettings(); QString keyBase(bool =true) const; QString value(QString, bool just_check); + + QHash<QString, QString> m_values; + public: QMakeProperty(); ~QMakeProperty(); |