summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2016-12-08 21:31:32 +0100
committerAndy Shaw <andy.shaw@qt.io>2016-12-09 16:10:51 +0000
commitb4fc0df834412de5b25b105a2141968d53d37df2 (patch)
treeff00489ba38241ca3febb1d2bbfb2baeefa53d68 /src
parent63d2cb62f092e3932186c666db888ff3b61b51cd (diff)
Use an uint for scode as opposed to unsigned short to avoid truncation
Since scode is effectively an uint and not an unsigned short like wcode is then we should go with the bigger type to ensure it is not truncated. Change-Id: I6f1affea5a06371eb3c3a632c3ecb9578f6254e4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/activeqt/container/qaxbase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index f2deedb..4e37b88 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -3396,7 +3396,7 @@ static bool checkHRESULT(HRESULT hres, EXCEPINFO *exc, QAxBase *that, const QStr
case DISP_E_EXCEPTION:
{
bool printWarning = true;
- unsigned short code = ushort(-1);
+ unsigned int code = uint(-1);
QString source, desc, help;
const QMetaObject *mo = that->metaObject();
int exceptionSignal = mo->indexOfSignal("exception(int,QString,QString,QString)");