summaryrefslogtreecommitdiff
path: root/src/linguist/shared/proitems.cpp
diff options
context:
space:
mode:
authorRichard Dale <richard.dale@codethink.co.uk>2013-07-04 09:57:04 +0100
committerRichard Dale <richard.dale@codethink.co.uk>2013-07-04 09:57:04 +0100
commit1369d91dd095cd4ea2febe759ef6446e41bd2d80 (patch)
tree656d71652bbb7de46fd9f5c969c31d43e2226a6e /src/linguist/shared/proitems.cpp
parent1a7cc5018eb56a68756e1115fd0b0d1529e69f19 (diff)
parentd403785d9bc5ce27d1aa28ab68200a97a8bffcf5 (diff)
downloadqttools-1369d91dd095cd4ea2febe759ef6446e41bd2d80.tar.gz
Merge v5.1.0 releasebaserock/morph
Diffstat (limited to 'src/linguist/shared/proitems.cpp')
-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();