Showing the changes to interface/src/scripting/WebWindowClass.cpp (1 of 5 files). Show all
Unified · Split
| @@ -54,6 +54,7 @@ WebWindowClass::WebWindowClass(const QString& title, const QString& url, int wid · 53 unmodified lines | |||
| 54 | 54 | ||
| 55 | _windowWidget = dockWidget; | 55 | _windowWidget = dockWidget; |
| 56 | } else { | 56 | } else { |
| 57 | |||
| 57 | _windowWidget = new QWidget(Application::getInstance()->getWindow(), Qt::Window); | 58 | _windowWidget = new QWidget(Application::getInstance()->getWindow(), Qt::Window); |
| 58 | _windowWidget->setWindowTitle(title); | 59 | _windowWidget->setWindowTitle(title); |
| 59 | _windowWidget->setMinimumSize(width, height); | 60 | _windowWidget->setMinimumSize(width, height); |
| @@ -89,24 +90,24 @@ void WebWindowClass::setVisible(bool visible) { · 29 unmodified lines | |||
| 89 | if (visible) { | 90 | if (visible) { |
| 90 | if (_isToolWindow) { | 91 | if (_isToolWindow) { |
| 91 | QMetaObject::invokeMethod( | 92 | QMetaObject::invokeMethod( |
| 92 | Application::getInstance()->getToolWindow(), "setVisible", Qt::BlockingQueuedConnection, Q_ARG(bool, visible)); | 93 | Application::getInstance()->getToolWindow(), "setVisible", Qt::AutoConnection, Q_ARG(bool, visible)); |
| 93 | } else { | 94 | } else { |
| 94 | QMetaObject::invokeMethod(_windowWidget, "raise", Qt::BlockingQueuedConnection); | 95 | QMetaObject::invokeMethod(_windowWidget, "raise", Qt::AutoConnection); |
| 95 | } | 96 | } |
| 96 | } | 97 | } |
| 97 | QMetaObject::invokeMethod(_windowWidget, "setVisible", Qt::BlockingQueuedConnection, Q_ARG(bool, visible)); | 98 | QMetaObject::invokeMethod(_windowWidget, "setVisible", Qt::AutoConnection, Q_ARG(bool, visible)); |
| 98 | } | 99 | } |
| 99 | 100 | ||
| 100 | void WebWindowClass::setURL(const QString& url) { | 101 | void WebWindowClass::setURL(const QString& url) { |
| 101 | if (QThread::currentThread() != thread()) { | 102 | if (QThread::currentThread() != thread()) { |
| 102 | QMetaObject::invokeMethod(this, "setURL", Qt::BlockingQueuedConnection, Q_ARG(QString, url)); | 103 | QMetaObject::invokeMethod(this, "setURL", Qt::AutoConnection, Q_ARG(QString, url)); |
| 103 | return; | 104 | return; |
| 104 | } | 105 | } |
| 105 | _webView->setUrl(url); | 106 | _webView->setUrl(url); |
| 106 | } | 107 | } |
| 107 | 108 | ||
| 108 | void WebWindowClass::raise() { | 109 | void WebWindowClass::raise() { |
| 109 | QMetaObject::invokeMethod(_windowWidget, "raise", Qt::BlockingQueuedConnection); | 110 | QMetaObject::invokeMethod(_windowWidget, "raise", Qt::AutoConnection); |
| 110 | } | 111 | } |
| 111 | 112 | ||
| 112 | QScriptValue WebWindowClass::constructor(QScriptContext* context, QScriptEngine* engine) { | 113 | QScriptValue WebWindowClass::constructor(QScriptContext* context, QScriptEngine* engine) { |