diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-13 15:08:06 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-13 15:08:06 (GMT) |
| commit | d077a3eac8f0401a18913471e08709e74552c507 (patch) | |
| tree | ad83af83620995dd79ebb12abd35d85282b95c6f /tools/linguist/shared/profileevaluator.h | |
| parent | 6744a0d6095277e1876694cc8fe42b41997c6c31 (diff) | |
| parent | 8f65472671406ad5881b119ba32b075b828bbb1a (diff) | |
| download | Qt-d077a3eac8f0401a18913471e08709e74552c507.zip Qt-d077a3eac8f0401a18913471e08709e74552c507.tar.gz Qt-d077a3eac8f0401a18913471e08709e74552c507.tar.bz2 | |
Merge commit 'origin/4.5'
Conflicts:
src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp
src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp
src/3rdparty/webkit/WebCore/generated/CSSGrammar.h
src/3rdparty/webkit/WebCore/generated/Grammar.cpp
src/3rdparty/webkit/WebCore/generated/Grammar.h
src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp
src/3rdparty/webkit/WebCore/generated/XPathGrammar.h
src/3rdparty/webkit/WebKit/qt/ChangeLog
tools/linguist/lrelease/main.cpp
tools/linguist/lupdate/main.cpp
tools/linguist/shared/profileevaluator.cpp
Diffstat (limited to 'tools/linguist/shared/profileevaluator.h')
| -rw-r--r-- | tools/linguist/shared/profileevaluator.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/linguist/shared/profileevaluator.h b/tools/linguist/shared/profileevaluator.h index 69f47f5..688022b 100644 --- a/tools/linguist/shared/profileevaluator.h +++ b/tools/linguist/shared/profileevaluator.h @@ -52,12 +52,6 @@ QT_BEGIN_NAMESPACE -class ProFile; -class ProFileEvaluator; - -void evaluateProFile(const ProFileEvaluator &visitor, QHash<QByteArray, QStringList> *varMap); -bool evaluateProFile(const QString &fileName, bool verbose, QHash<QByteArray, QStringList> *varMap); - class ProFileEvaluator { public: @@ -85,6 +79,10 @@ public: void addProperties(const QHash<QString, QString> &properties); QStringList values(const QString &variableName) const; QStringList values(const QString &variableName, const ProFile *pro) const; + QStringList absolutePathValues(const QString &variable, const QString &baseDirectory) const; + QStringList absoluteFileValues( + const QString &variable, const QString &baseDirectory, const QStringList &searchDirs, + const ProFile *pro) const; QString propertyValue(const QString &val) const; // for our descendents |