summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2013-05-03 13:29:54 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-28 12:50:39 +0200
commite5de212fdcd56c3a6207cd1a863cf1489339709a (patch)
tree3bf1fdd10cdda8db9d58e6fe557bad1f4e3cbe0c
parentcd6ecebad770932034b4b5efa8e288acc1c92c9e (diff)
downloadqttools-e5de212fdcd56c3a6207cd1a863cf1489339709a.tar.gz
fix warning in ProStringList_join
Fix C4267 MSVC warning. Make sepSize an int, because this function is never called with a size_t. Change-Id: I2b834fe7c1408e34d55d9f137231e2f5816f3f1d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/98a73e16012f75934ce4b6e4c85fb4d6a2ad0a28) Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
-rw-r--r--src/linguist/shared/proitems.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/linguist/shared/proitems.cpp b/src/linguist/shared/proitems.cpp
index 59029bc5d..8db3026eb 100644
--- a/src/linguist/shared/proitems.cpp
+++ b/src/linguist/shared/proitems.cpp
@@ -345,7 +345,7 @@ QTextStream &operator<<(QTextStream &t, const ProString &str)
return t;
}
-static QString ProStringList_join(const ProStringList &this_, const QChar *sep, const size_t sepSize)
+static QString ProStringList_join(const ProStringList &this_, const QChar *sep, const int sepSize)
{
int totalLength = 0;
const int sz = this_.size();