History

Merge branch 'master' of https://github.com/highfidelity/hifi into 20170

Stojce Slavkovski committed 11 years ago

Commit cc487d72 parents 06da1bd 8b4b2c5207 files · +13014 −5580Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 207 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+4−0
@@ -34,6 +34,10 @@ WindowScriptingInterface::WindowScriptingInterface() : · 33 unmodified lines
3434 {
3535 }
3636
37+WebWindowClass* WindowScriptingInterface::doCreateWebWindow(const QString& title, const QString& url, int width, int height) {
38+ return new WebWindowClass(title, url, width, height);
39+}
40+
3741 QScriptValue WindowScriptingInterface::hasFocus() {
3842 return Application::getInstance()->getGLWidget()->hasFocus();
3943 }