Merged conflicts from pulling down latest development

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 16:29:27 -05:00
parent 40f9761f86 e9dd032a75
commit f47e71da36
119 changed files with 1006 additions and 1506 deletions
@@ -1,26 +1,12 @@
 {
    "gem_name": "QtForPython",
-    "GemFormatVersion": 4,
-    "Uuid": "cd50c7a1e31f4c9495dcffdacc3bde92",
-    "Name": "QtForPython",
-    "DisplayName": "QtForPython",
-    "Version": "0.1.0",
-    "Summary": "Adds the ability to use the PySide2 Python libraries to manage Qt widgets.",
-    "Tags": ["Editor"],
-    "IconPath": "preview.png",
-    "Modules": [
-        {
-            "Name": "Editor",
-            "Type": "EditorModule"
-        }
-    ],
-    "Dependencies": [
-        {
-            "Uuid": "b658359393884c4381c2fe2952b1472a",
-            "VersionConstraints": [
-                "~>0.1"
-            ],
-            "_comment": "EditorPythonBindings"
-        }
-    ]
-}
+    "display_name": "Qt for Python",
+    "license": "Apache-2.0 Or MIT",
+    "origin": "Open 3D Engine - o3de.org",
+    "type": "Tool",
+    "summary": "The Qt for Python Gem provides the PySide2 Python libraries to manage Qt widgets.",
+    "canonical_tags": ["Gem"],
+    "user_tags": ["Scripting", "UI", "Framework"],
+    "icon_path": "preview.png",
+    "requirements": ""
+  }