Merge remote-tracking branch 'origin/8.0' into 9.0

Conflicts:
  src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
  src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
  src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: I24216ae3f83cdde3493b4a6274e24a72f75820fc

2 files changed, 0 insertions, 40 deletions

diff --git a/share/qtcreator/templates/wizards/files/effect/file.qep b/share/qtcreator/templates/wizards/files/effect/file.qep
deleted file mode 100644
index e69de29bb2..0000000000
--- a/share/qtcreator/templates/wizards/files/effect/file.qep
+++ /dev/null
diff --git a/share/qtcreator/templates/wizards/files/effect/wizard.json b/share/qtcreator/templates/wizards/files/effect/wizard.json
deleted file mode 100644
index d966f097ed..0000000000
--- a/share/qtcreator/templates/wizards/files/effect/wizard.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "version": 1,
-    "supportedProjectTypes": [ ],
-    "id": "J.QEP",
-    "category": "U.QEP",
-    "trDescription": "Creates an Effect Maker file.",
-    "trDisplayName": "Effect File (Effect Maker)",
-    "trDisplayCategory": "Effects",
-    "iconText": "qep",
-    "platformIndependent": true,
-    "enabled": true,
-
-    "options": { "key": "DefaultSuffix", "value": "qep" },
-
-    "pages" :
-    [
-        {
-            "trDisplayName": "Location",
-            "trShortTitle": "Location",
-            "typeId": "File"
-        },
-        {
-            "trDisplayName": "Project Management",
-            "trShortTitle": "Summary",
-            "typeId": "Summary"
-        }
-    ],
-    "generators" :
-    [
-        {
-            "typeId": "File",
-            "data":
-            {
-                "source": "file.qep",
-                "target": "%{JS: Util.fileName(value('TargetPath'), value('DefaultSuffix'))}",
-                "openInEditor": false
-            }
-        }
-    ]
-}