summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-03-19 16:39:06 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-03-24 11:37:27 +0000
commit1a6011d23e5ac37e5ded891b56a3fa5f3789ab3d (patch)
tree1d85bb7ae70c3d45ab4fe67bf22d9033bba066de
parent8f054499d8f5c6377b6af12307cb37ed7f818af0 (diff)
idc: Add support for char, uchar, short, ushort and float.
Task-number: QTBUG-45057 Change-Id: Ic14b48d3cb453a46ee73a7398f27e59fbc05d757 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-rw-r--r--src/activeqt/control/qaxserver.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp
index 4326eb8..2de749f 100644
--- a/src/activeqt/control/qaxserver.cpp
+++ b/src/activeqt/control/qaxserver.cpp
@@ -467,9 +467,16 @@ static const char* const type_map[][2] =
{ "QString", "BSTR" },
{ "QCString", "BSTR" },
{ "bool", "VARIANT_BOOL" },
+ { "char", "char" },
+ { "unsigned char", "unsigned char" },
+ { "uchar", "unsigned char" },
+ { "short", "short" },
+ { "unsigned short", "unsigned short" },
+ { "ushort", "unsigned short" },
{ "int", "int" },
{ "void", "void" },
{ "uint", "unsigned int" },
+ { "float", "float" },
{ "double", "double" },
{ "QColor", "OLE_COLOR" },
{ "QDate", "DATE" },