Support QML and Web content in overlay windows

Brad Davis committed 10 years ago

Commit 0901e3a1 parent a5c19c011 files · +498 −273Browse files

Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all

Unified · Split

interface/src/Application.cpp+1−0

@@ -4111,6 +4111,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 4110 unmodified lines
4111		4111
4112	scriptEngine->registerFunction("WebWindow", WebWindowClass::constructor, 1);	4112	scriptEngine->registerFunction("WebWindow", WebWindowClass::constructor, 1);
4113	scriptEngine->registerFunction("OverlayWebWindow", QmlWebWindowClass::constructor);	4113	scriptEngine->registerFunction("OverlayWebWindow", QmlWebWindowClass::constructor);
		4114	scriptEngine->registerFunction("OverlayWindow", QmlWindowClass::constructor);
4114		4115
4115	scriptEngine->registerGlobalObject("Menu", MenuScriptingInterface::getInstance());	4116	scriptEngine->registerGlobalObject("Menu", MenuScriptingInterface::getInstance());
4116	scriptEngine->registerGlobalObject("Stats", Stats::getInstance());	4117	scriptEngine->registerGlobalObject("Stats", Stats::getInstance());