From b66357e3ebf3e3dbda04f880e87184e247882843 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 5 Sep 2018 10:01:00 -0700
Subject: [PATCH] moc: Fix compilation of text strings containing non-ASCII

On platforms where char is signed, like x86, the following is an error
(narrowing conversion):

 unsigned char x[] = { '\xc3' };

Change-Id: I495bc19409f348069f5bfffd15518f9ef4e43faf
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/tools/moc/cbordevice.h                      |  4 +++-
 .../plugin/qpluginloader/theplugin/theplugin.h  |  2 +-
 .../plugin/qpluginloader/tst_qpluginloader.cpp  |  8 ++++++++
 .../corelib/plugin/qpluginloader/utf8_data.json | 17 +++++++++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 tests/auto/corelib/plugin/qpluginloader/utf8_data.json

diff --git a/src/tools/moc/cbordevice.h b/src/tools/moc/cbordevice.h
index 25b75b79ebb..dbfc537dd20 100644
--- a/src/tools/moc/cbordevice.h
+++ b/src/tools/moc/cbordevice.h
@@ -82,8 +82,10 @@ private:
     void putChar(char c)
     {
         putNewline();
-        if (c < 0x20 || c >= 0x7f)
+        if (uchar(c) < 0x20)
             fprintf(out, " '\\x%x',", uint8_t(c));
+        else if (uchar(c) >= 0x7f)
+            fprintf(out, " uchar('\\x%x'),", uint8_t(c));
         else if (c == '\'' || c == '\\')
             fprintf(out, " '\\%c',", c);
         else
diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.h b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.h
index 04ce042e24b..ac349c2f757 100644
--- a/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.h
+++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.h
@@ -35,7 +35,7 @@
 class ThePlugin : public QObject, public PluginInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.autotests.plugininterface" FILE "../empty.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.autotests.plugininterface" FILE "../utf8_data.json")
     Q_INTERFACES(PluginInterface)
 
 public:
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
index 8e3ea91c409..c517c0809ae 100644
--- a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
+++ b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
@@ -210,6 +210,14 @@ void tst_QPluginLoader::errorString()
 
     {
     QPluginLoader loader( sys_qualifiedLibraryName("theplugin"));     //a plugin
+
+    // Check metadata
+    const QJsonObject metaData = loader.metaData();
+    QCOMPARE(metaData.value("IID").toString(), QStringLiteral("org.qt-project.Qt.autotests.plugininterface"));
+    const QJsonObject kpluginObject = metaData.value("MetaData").toObject().value("KPlugin").toObject();
+    QCOMPARE(kpluginObject.value("Name[mr]").toString(), QString::fromUtf8("चौकट भूमिती"));
+
+    // Load
     QCOMPARE(loader.load(), true);
     QCOMPARE(loader.errorString(), unknown);
 
diff --git a/tests/auto/corelib/plugin/qpluginloader/utf8_data.json b/tests/auto/corelib/plugin/qpluginloader/utf8_data.json
new file mode 100644
index 00000000000..7763b651786
--- /dev/null
+++ b/tests/auto/corelib/plugin/qpluginloader/utf8_data.json
@@ -0,0 +1,17 @@
+{
+    "KPlugin": {
+        "Name": "WindowGeometry",
+        "Name[mr]": "चौकट भूमिती",
+        "Name[pa]": "ਵਿੰਡੋਜੁਮੈਟਰੀ",
+        "Name[th]": "มิติขนาดของหน้าต่าง",
+        "Name[uk]": "Розміри вікна",
+        "Name[zh_CN]": "窗口形状",
+        "Name[zh_TW]": "視窗位置",
+        "ServiceTypes": [
+            "KCModule"
+        ]
+    },
+    "X-KDE-ParentComponents": [
+        "windowgeometry"
+    ]
+}