Git commit 81efcf69f9987053ec328ae4dcb40afab5b9afd2 by Arjen Hiemstra. Committed on 31/08/2014 at 14:00. Pushed by ahiemstra into branch 'master'. engine: Fix mime types of Scripting asset M +5 -2 engine/scripting/metadata.json M +0 -3 engine/scripting/scriptingcomponent.h http://commits.kde.org/gluon/81efcf69f9987053ec328ae4dcb40afab5b9afd2 diff --git a/engine/scripting/metadata.json b/engine/scripting/metadata.json index 2304f5b..2219ae9 100644 --- a/engine/scripting/metadata.json +++ b/engine/scripting/metadata.json @@ -4,7 +4,10 @@ "icon": "application-javascript", "category": "Game Logic", "mimeTypes": [ - "audio/javascript" + "application/javascript", + "application/x-javascript", + "application/ecmascript", + "text/javascript" ], "templates": { "Script": "scripting/scripting_template.js" @@ -15,4 +18,4 @@ "icon": "application-javascript", "category": "Game Logic" } -} \ No newline at end of file +} diff --git a/engine/scripting/scriptingcomponent.h b/engine/scripting/scrip= tingcomponent.h index 8e40347..f746b27 100644 --- a/engine/scripting/scriptingcomponent.h +++ b/engine/scripting/scriptingcomponent.h @@ -35,9 +35,6 @@ namespace GluonEngine = Q_PROPERTY( GluonEngine::ScriptingAsset* script READ script WR= ITE setScript ) = - Q_CLASSINFO( "org.gluon.category", "Game Logic" ) - Q_CLASSINFO( "org.gluon.icon", "application-javascript" ) - public: Q_INVOKABLE ScriptingComponent( QObject* parent =3D 0 ); virtual ~ScriptingComponent();