Fix datainput metadata API

Add QHash map for metadata and implement UI in datainput management dialog
for specifying metadata table. Metadata keys and values are stored in
UIA file under "metadata" tag, delimiter-separated by '$' chars. Requires
corresponding changes on Runtime side.

Change-Id: I335ed893984208dcad3171357feb2e485bafea3b
Task-id: QT3DS-3046
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/Authoring/Client/Code/Core/Doc/Doc.h b/src/Authoring/Client/Code/Core/Doc/Doc.h
index c18b85fb..60f0c3e6 100644
--- a/src/Authoring/Client/Code/Core/Doc/Doc.h
+++ b/src/Authoring/Client/Code/Core/Doc/Doc.h
@@ -51,6 +51,7 @@
 
 #include <QtCore/quuid.h>
 #include <QtCore/qsize.h>
+#include <QtCore/qhash.h>
 
 //==============================================================================
 //	Forwards
@@ -184,11 +185,10 @@ public:
     QString name;
     int type;
     QVector<ControlledItem> ctrldElems;
-    // As per QT3DS-2992 we currently need only a single key-value pair per datainput.
-    // For efficiency we use separate QStrings for both, as there is no need for more
-    // elaborate containers.
-    QString metaDataKey;
-    QString metaData;
+
+    // On editor side we use just QStrings as metadata will be squashed into strings
+    // anyway when storing into UIA file. (Runtime uses QVariants.)
+    QHash<QString, QString> metadata;
 
     // Bindings in other subpresentations, of QMap format
     // QMultiMap<subpresentation_id, QPair<datatype, strict>>.