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>
(cherry picked from commit f0f12ea5f1b6fdaf3e2e38bf8d814dfa41cbca5b)

1 files changed, 7 insertions, 1 deletions

diff --git a/qmake/project.h b/qmake/project.h
index c9d2084dc5..d87380b705 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -189,12 +189,18 @@ inline QString QMakeProject::first(const QString &v)
     return vals.first();
 }
 
+/*!
+ * 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 QString &v, int defaultValue)
 {
     const QString str = first(v);
     if (!str.isEmpty()) {
         bool ok;
-        int i = str.toInt(&ok);
+        int i = str.toInt(&ok, 0);
         if (ok)
             return i;
     }