diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-12-17 12:57:13 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-17 14:08:17 +0100 |
commit | f0f12ea5f1b6fdaf3e2e38bf8d814dfa41cbca5b (patch) | |
tree | cb61a3edc0d87b4a18d008203310b65dd5d1d457 /qmake/project.h | |
parent | 9a1183b400748aa51132dd17d004d9d6e560b5b8 (diff) |
accept hex/octal values for RC_LANG and RC_CODEPAGE
Task-number: QTBUG-28624
Change-Id: I6188045b05ebb8b9d285d1b30f8082a2fe46ff8b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/project.h')
-rw-r--r-- | qmake/project.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/qmake/project.h b/qmake/project.h index e3b2925ccf..c07b6e6e46 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -95,12 +95,18 @@ private: static bool boolRet(VisitReturn vr); }; +/*! + * For variables that are supposed to contain a single int, + * this method returns the numeric value. + * Only the first value of the variable is taken into account. + * The string representation is assumed to look like a C int literal. + */ inline int QMakeProject::intValue(const ProKey &v, int defaultValue) const { const ProString &str = first(v); if (!str.isEmpty()) { bool ok; - int i = str.toInt(&ok); + int i = str.toInt(&ok, 0); if (ok) return i; } |