diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-01 21:57:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-01 21:57:27 +0200 |
| commit | fab7808e45c6742d7529b7df55f0d5e3fe9c7b50 (patch) | |
| tree | c12047d05afad97eb8512379b55863f1d77e0089 | |
| parent | 829abebf3334218182d6b334855e4ae4658575f4 (diff) | |
| parent | e5878886ed8261fb5d3e1fb93595be03e8f12b8d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I41fbcae8340f30007455b596869be668b65ef0a7
| -rw-r--r-- | src/activeqt/control/qaxserver.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp index b02c38b..35a32dd 100644 --- a/src/activeqt/control/qaxserver.cpp +++ b/src/activeqt/control/qaxserver.cpp @@ -490,10 +490,10 @@ static const char* const type_map[][2] = { "QVariant", "VARIANT" }, { "QVariantList", "SAFEARRAY(VARIANT)" }, { "QList<QVariant>", "SAFEARRAY(VARIANT)" }, - { "quint64", "CY" }, - { "qint64", "CY" }, - { "qulonglong", "CY" }, - { "qlonglong", "CY" }, + { "quint64", "unsigned hyper" }, + { "qint64", "hyper" }, + { "qulonglong", "unsigned hyper" }, + { "qlonglong", "hyper" }, { "QByteArray", "SAFEARRAY(BYTE)" }, { "QStringList", "SAFEARRAY(BSTR)" }, // Userdefined Qt datatypes - some not on Borland though |