diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2011-11-16 14:47:11 -0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-24 17:07:52 +0100 |
| commit | e22a6108fda7cac78f5597247ce7b0628b6ba3e2 (patch) | |
| tree | 49858a35bf398e8137c853bbd258b826adbe8974 /src/dbus/qdbusabstractadaptor.cpp | |
| parent | 387ec9c2a35b2b181e2b2ca29079ecb44eac87e9 (diff) | |
Use QVector<int> instead of QList<int> for storing metatypes in QtDBus
Change I00020eed fixed a bug present in 64-bit machines because it
tried to access QList<int>'s internal array data, assuming it was a
vector of ints. That worked in 32-bit, but not 64-bit.
The fix involves a conversion between QList and QVector. Now fix it
properly by changing everything to be QVector. The benefit is that on
64-bit, they are real vectors, not the 50%-overhead pointer array that
QList is.
Change-Id: I989ad279d0d8b2c9ab262a1eed413ab2365b5461
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/dbus/qdbusabstractadaptor.cpp')
| -rw-r--r-- | src/dbus/qdbusabstractadaptor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp index 7bdd947a37..e8c56eb990 100644 --- a/src/dbus/qdbusabstractadaptor.cpp +++ b/src/dbus/qdbusabstractadaptor.cpp @@ -296,7 +296,7 @@ void QDBusAdaptorConnector::relay(QObject *senderObj, int lastSignalIdx, void ** realObject = realObject->parent(); // break down the parameter list - QList<int> types; + QVector<int> types; int inputCount = qDBusParametersForMethod(mm, types); if (inputCount == -1) // invalid signal signature |