Details
-
Suggestion
-
Resolution: Done
-
P4: Low
-
4.8.4
-
None
-
f0f12ea5f1b6fdaf3e2e38bf8d814dfa41cbca5b (5.0.1), 0deddff9c8ca7e1a1e9288a09bc015fd7ea0fd03 (4.8.5)
Description
While fixing QTBUG-23218 there was introduced a function called "intValue" in
class QMakeProject to read the values for RC_LANG and RC_CODEPAGE from the .pro-file.
Unfortunately this didnt allow hex-Values for these entries.
This patch will bring back that functionality
--- d:\qt\4.8.4.org\qmake\project.h 2012-11-23 12:11:22.000000000 +0100 +++ d:\qt\4.8.4\qmake\project.h 2012-12-12 15:07:56.000000000 +0100 @@ -191,19 +191,19 @@ 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; } return defaultValue; } inline QMap<QString, QStringList> &QMakeProject::variables() { return vars; } QT_END_NAMESPACE #endif // PROJECT_H