diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-12-03 15:57:13 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-06 11:49:01 +0100 |
| commit | f224d3c106027dc6986756b81be79d1da7d98747 (patch) | |
| tree | 7a74cfb8d371e150168ed4cdc17a4500e1bf1050 | |
| parent | baf51fb821d251a67e05fcee0b07c67ac8f9a652 (diff) | |
dumpcpp: compile with QT_NO_CAST_TO_ASCII
Change-Id: I96750ea25c6b4499dccf55509510c076bc4ad371
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
(cherry picked from commit 59a003faafe53a155e4a46725ef41b1b7dca4b75)
| -rw-r--r-- | tools/dumpcpp/dumpcpp.pro | 1 | ||||
| -rw-r--r-- | tools/dumpcpp/main.cpp | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/dumpcpp/dumpcpp.pro b/tools/dumpcpp/dumpcpp.pro index 3917298..9dd6d27 100644 --- a/tools/dumpcpp/dumpcpp.pro +++ b/tools/dumpcpp/dumpcpp.pro @@ -1,4 +1,5 @@ QT += axcontainer widgets core-private +DEFINES += QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS SOURCES = main.cpp diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp index 1af4518..f45af6f 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp @@ -475,7 +475,7 @@ void generateClassDecl(QTextStream &out, const QString &controlID, const QMetaOb out << endl; out << indent << "{" << endl; - if (slotType != QStringLiteral("void")) { + if (slotType != QByteArrayLiteral("void")) { out << indent << " " << slotType << " qax_result"; if (slotType.endsWith('*')) out << " = 0"; @@ -493,7 +493,7 @@ void generateClassDecl(QTextStream &out, const QString &controlID, const QMetaOb } } out << indent << " void *_a[] = {"; - if (slotType != QStringLiteral("void")) + if (slotType != QByteArrayLiteral("void")) out << "(void*)&qax_result"; else out << "0"; @@ -504,7 +504,7 @@ void generateClassDecl(QTextStream &out, const QString &controlID, const QMetaOb out << "};" << endl; out << indent << " qt_metacall(QMetaObject::InvokeMetaMethod, " << islot << ", _a);" << endl; - if (slotType != QStringLiteral("void")) + if (slotType != QByteArrayLiteral("void")) out << indent << " return qax_result;" << endl; out << indent << "}" << endl; } @@ -1007,7 +1007,7 @@ bool generateTypeLibrary(const QByteArray &typeLib, const QByteArray &outname, O libName = QString::fromWCharArray(nameString); SysFreeString(nameString); if (!nameSpace.isEmpty()) - libName = QString(nameSpace); + libName = QString::fromLocal8Bit(nameSpace); QString libVersion(QLatin1String("1.0")); |