From b4bd45d82adc5a859fcf6febb325913884c97517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@guh.io>
Date: Fri, 9 Feb 2018 13:09:52 +0100
Subject: [PATCH] Fix deprecated eventTypeName and make json files visible to
 the Qt Creator

---
 elgato/devicepluginelgato.json | 4 ++--
 plugins.pri                    | 3 +++
 senic/devicepluginsenic.json   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/elgato/devicepluginelgato.json b/elgato/devicepluginelgato.json
index 5cf1cb4b..cfc40484 100644
--- a/elgato/devicepluginelgato.json
+++ b/elgato/devicepluginelgato.json
@@ -41,7 +41,7 @@
                             "id": "6d5e792a-c786-40d2-ae35-a48ac6fafcbc",
                             "name": "connected",
                             "displayName": "connected",
-                            "eventTypeName": "connected changed",
+                            "displayNameEvent": "connected changed",
                             "type": "bool",
                             "defaultValue": false
                         },
@@ -64,7 +64,7 @@
                             "name": "color",
                             "displayName": "color",
                             "displayNameEvent": "color changed",
-                            "disoplayNameAction": "Set color",
+                            "displayNameAction": "Set color",
                             "type": "QColor",
                             "ruleRelevant": false,
                             "eventRuleRelevant": false,
diff --git a/plugins.pri b/plugins.pri
index 1eacbb46..06d5c8a9 100644
--- a/plugins.pri
+++ b/plugins.pri
@@ -18,6 +18,9 @@ snappy{
     INCLUDEPATH+=$$(SNAPCRAFT_STAGE)/usr/include/guh
 }
 
+# Make the device plugin json file visible in the Qt Creator
+OTHER_FILES+=$$PWD/$${TARGET}/deviceplugin"$$TARGET".json
+
 # Create plugininfo file
 plugininfo.commands = guh-generateplugininfo --filetype i --jsonfile $$PWD/$${TARGET}/deviceplugin"$$TARGET".json --output plugininfo.h --builddir $$OUT_PWD; \
                       guh-generateplugininfo --filetype e --jsonfile $$PWD/$${TARGET}/deviceplugin"$$TARGET".json --output extern-plugininfo.h --builddir $$OUT_PWD;
diff --git a/senic/devicepluginsenic.json b/senic/devicepluginsenic.json
index 629d8dac..0e06f229 100644
--- a/senic/devicepluginsenic.json
+++ b/senic/devicepluginsenic.json
@@ -47,7 +47,7 @@
                             "id": "5c400da4-a14e-4e0a-be9f-c82ffe7e1972",
                             "name": "hardwareRevision",
                             "displayName": "Hardware revision",
-                            "eventTypeName": "Hardware revision changed",
+                            "displayNameEvent": "Hardware revision changed",
                             "type": "QString",
                             "defaultValue": "-"
                         },