Showing the changes to interface/src/scripting/WebWindowClass.cpp (1 of 5 files). Show all
Unified · Split
| @@ -28,7 +28,8 @@ void ScriptEventBridge::emitScriptEvent(const QString& data) { · 27 unmodified lines | |||
| 28 | emit scriptEventReceived(data); | 28 | emit scriptEventReceived(data); |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | WebWindowClass::WebWindowClass(const QString& url, int width, int height) | 31 | |
| 32 | WebWindowClass::WebWindowClass(const QString& title, const QString& url, int width, int height) | ||
| 32 | : QObject(NULL), | 33 | : QObject(NULL), |
| 33 | _window(new QWidget(NULL, Qt::Tool)), | 34 | _window(new QWidget(NULL, Qt::Tool)), |
| 34 | _eventBridge(new ScriptEventBridge(this)) { | 35 | _eventBridge(new ScriptEventBridge(this)) { |
| @@ -59,8 +60,9 @@ QScriptValue WebWindowClass::constructor(QScriptContext* context, QScriptEngine* · 24 unmodified lines | |||
| 59 | QMetaObject::invokeMethod(WindowScriptingInterface::getInstance(), "doCreateWebWindow", Qt::BlockingQueuedConnection, | 60 | QMetaObject::invokeMethod(WindowScriptingInterface::getInstance(), "doCreateWebWindow", Qt::BlockingQueuedConnection, |
| 60 | Q_RETURN_ARG(WebWindowClass*, retVal), | 61 | Q_RETURN_ARG(WebWindowClass*, retVal), |
| 61 | Q_ARG(const QString&, file), | 62 | Q_ARG(const QString&, file), |
| 62 | Q_ARG(int, context->argument(1).toInteger()), | 63 | Q_ARG(QString, context->argument(1).toString()), |
| 63 | Q_ARG(int, context->argument(2).toInteger())); | 64 | Q_ARG(int, context->argument(2).toInteger()), |
| 65 | Q_ARG(int, context->argument(3).toInteger())); | ||
| 64 | 66 | ||
| 65 | connect(engine, &QScriptEngine::destroyed, retVal, &WebWindowClass::deleteLater); | 67 | connect(engine, &QScriptEngine::destroyed, retVal, &WebWindowClass::deleteLater); |
| 66 | 68 | ||