History

Merge remote-tracking branch 'upstream/master' into web-entity

Brad Davis committed 11 years ago

Commit 8c4f8022 parents 525df2e fa416cf19 files · +359 −84Browse files

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

Unified · Split

interface/src/scripting/WebWindowClass.cpp+5−1
@@ -79,7 +79,11 @@ WebWindowClass::WebWindowClass(const QString& title, const QString& url, int wid · 78 unmodified lines
79 }79 }
80 80
81 _webView->setPage(new DataWebPage());81 _webView->setPage(new DataWebPage());
82 _webView->setUrl(url);82 if (!url.startsWith("http")) {
83 _webView->setUrl(QUrl::fromLocalFile(url));
84 } else {
85 _webView->setUrl(url);
86 }
83 87
84 connect(this, &WebWindowClass::destroyed, _windowWidget, &QWidget::deleteLater);88 connect(this, &WebWindowClass::destroyed, _windowWidget, &QWidget::deleteLater);
85 connect(_webView->page()->mainFrame(), &QWebFrame::javaScriptWindowObjectCleared,89 connect(_webView->page()->mainFrame(), &QWebFrame::javaScriptWindowObjectCleared,