summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2012-12-17 12:56:02 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-17 14:08:17 +0100
commit9a1183b400748aa51132dd17d004d9d6e560b5b8 (patch)
treec11a77d1793b555ce2ed57e7012cc0023264875e /qmake
parent826c4f60b65532033045e76d34fb718957a26fa9 (diff)
add base parameter to ProString::toInt and ProString::toShort
Change-Id: I0c8b48e6491486ca829ce24ca2e284294ba0138a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/library/proitems.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/library/proitems.h b/qmake/library/proitems.h
index cb6a7dfcfe..f08b38b5bd 100644
--- a/qmake/library/proitems.h
+++ b/qmake/library/proitems.h
@@ -143,8 +143,8 @@ public:
bool contains(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return indexOf(s, 0, cs) >= 0; }
bool contains(const char *s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return indexOf(QLatin1String(s), 0, cs) >= 0; }
bool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return indexOf(c, 0, cs) >= 0; }
- int toInt(bool *ok = 0) const { return toQString().toInt(ok); } // XXX optimize
- short toShort(bool *ok = 0) const { return toQString().toShort(ok); } // XXX optimize
+ int toInt(bool *ok = 0, int base = 10) const { return toQString().toInt(ok, base); } // XXX optimize
+ short toShort(bool *ok = 0, int base = 10) const { return toQString().toShort(ok, base); } // XXX optimize
static uint hash(const QChar *p, int n);