1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

accept hex/octal values for RC_LANG and RC_CODEPAGE

Browse Source 
Task-number: QTBUG-28624

Change-Id: I6188045b05ebb8b9d285d1b30f8082a2fe46ff8b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Joerg Bornemann 2012-12-17 12:57:13 +01:00 committed by The Qt Project
parent 9a1183b400
commit f0f12ea5f1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qmake/project.h
View File

@ -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;
}