summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-09-29 08:36:03 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-09-29 08:37:46 (GMT)
commitf3d17ff4ca511175817d202d71fee266b72cb815 (patch)
tree62fc061f6c193c0901eb1742ee7012b88c3fa5c7
parent6dded946799bc9c5ff38a3f51495079b059c8180 (diff)
downloadQt-f3d17ff4ca511175817d202d71fee266b72cb815.zip
Qt-f3d17ff4ca511175817d202d71fee266b72cb815.tar.gz
Qt-f3d17ff4ca511175817d202d71fee266b72cb815.tar.bz2
fix solaris build
"A class with a reference member must have a user-defined constructor."
-rw-r--r--tools/linguist/lupdate/cpp.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp
index ed41edb..7a616e3 100644
--- a/tools/linguist/lupdate/cpp.cpp
+++ b/tools/linguist/lupdate/cpp.cpp
@@ -1031,6 +1031,10 @@ QStringList CppParser::stringListifySegments(const QList<HashString> &segments)
}
struct QualifyOneData {
+ QualifyOneData(const NamespaceList &ns, int nsc, const HashString &seg, NamespaceList *rslvd)
+ : namespaces(ns), nsCount(nsc), segment(seg), resolved(rslvd)
+ {}
+
const NamespaceList &namespaces;
int nsCount;
const HashString &segment;
@@ -1069,7 +1073,7 @@ bool CppParser::qualifyOneCallbackUsing(const Namespace *ns, void *context) cons
bool CppParser::qualifyOne(const NamespaceList &namespaces, int nsCnt, const HashString &segment,
NamespaceList *resolved) const
{
- QualifyOneData data = { namespaces, nsCnt, segment, resolved, QSet<HashStringList>() };
+ QualifyOneData data(namespaces, nsCnt, segment, resolved);
if (visitNamespace(namespaces, nsCnt, &CppParser::qualifyOneCallbackOwn, &data))
return true;