diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-07 11:04:25 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-07 11:04:25 +0100 |
commit | a89d18b1bc455f99b01594967843aaadd07e4556 (patch) | |
tree | 2f0d87b98da94c952a4d22a1e02cd3af5b34ff82 | |
parent | b5fe909571aff02bbd3d6cba8865c8eef36de9c7 (diff) | |
parent | ca7647e94748b499641e0800ee4aed158e89238b (diff) | |
download | qtactiveqt-a89d18b1bc455f99b01594967843aaadd07e4556.tar.gz |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I7b45c53c42792e0b7ab5af61d6b3874c9fc6747a
-rw-r--r-- | src/activeqt/container/qaxbase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index b3c2b90..acc319e 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -3640,7 +3640,7 @@ int QAxBase::internalInvoke(QMetaObject::Call call, int index, void **v) if (dispid == DISPID_UNKNOWN && slotname.toLower().startsWith("set")) { // see if we are calling a property set function as a slot - slotname.remove(0, slotname.length() - 3); + slotname.remove(0, 3); dispid = d->metaobj->dispIDofName(slotname, disp); isProperty = true; } |