diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:52:00 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:52:00 +0100 |
| commit | f89a45187fc367d3932ba69cd708263fcaff8356 (patch) | |
| tree | 332154be0206c04bb789ae476ad16b30237bf10a /src | |
| parent | d72a0b44812c38fc3ba9dd5b3deb87796b5c338a (diff) | |
| parent | 6d57918ce6c45b811c3a71e320b318222c7846b1 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I80198f4338b8930811f65b56626ad3a0dda84b5b
Diffstat (limited to 'src')
| -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 |