diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 16:19:29 +0200 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 19:22:48 +0200 |
| commit | d236fe2214340164bec4f34cb27dea4a634ee0de (patch) | |
| tree | cda4ebbcc91717b37e5a2dbccb9ee46c2a1d3885 /src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp | |
| parent | 2b17b0235b70f89d15d3b91a14c3297d38377f94 (diff) | |
| parent | cbc883da6910b3357a4e03d0e2dfa841da1a03e8 (diff) | |
| download | qtbase-d236fe2214340164bec4f34cb27dea4a634ee0de.tar.gz | |
Merge master into api_changes
Conflicts:
src/corelib/global/qisenum.h
src/dbus/qdbusconnection_p.h
src/widgets/kernel/qwidget.cpp
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
Change-Id: I85102515d5fec835832cc20ffdc5c1ba578bd01d
Diffstat (limited to 'src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp')
| -rw-r--r-- | src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp index 2029147ecf..66a59b56ec 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp @@ -46,6 +46,7 @@ #include <QList> #include <QBuffer> #include <QRegExp> +#include <QVector> #include <stdio.h> #include <stdlib.h> @@ -94,7 +95,7 @@ static const char help[] = "\n"; -int qDBusParametersForMethod(const FunctionDef &mm, QList<int>& metaTypes) +int qDBusParametersForMethod(const FunctionDef &mm, QVector<int>& metaTypes) { QList<QByteArray> parameterTypes; @@ -138,7 +139,7 @@ static QString addFunction(const FunctionDef &mm, bool isSignal = false) { } } QList<ArgumentDef> names = mm.arguments; - QList<int> types; + QVector<int> types; int inputCount = qDBusParametersForMethod(mm, types); if (inputCount == -1) return QString(); // invalid form |