summaryrefslogtreecommitdiffstats
path: root/examples/webenginewidgets/simplebrowser
diff options
context:
space:
mode:
Diffstat (limited to 'examples/webenginewidgets/simplebrowser')
-rw-r--r--examples/webenginewidgets/simplebrowser/main.cpp14
-rw-r--r--examples/webenginewidgets/simplebrowser/tabwidget.cpp3
2 files changed, 10 insertions, 7 deletions
diff --git a/examples/webenginewidgets/simplebrowser/main.cpp b/examples/webenginewidgets/simplebrowser/main.cpp
index 5cd486b08..9b9bf80b5 100644
--- a/examples/webenginewidgets/simplebrowser/main.cpp
+++ b/examples/webenginewidgets/simplebrowser/main.cpp
@@ -54,12 +54,14 @@
#include <QApplication>
#include <QWebEngineSettings>
-QUrl getCommandLineUrlArgument()
+QUrl commandLineUrlArgument()
{
const QStringList args = QCoreApplication::arguments();
- if (args.count() > 1)
- return QUrl::fromUserInput(args.last());
- return QUrl();
+ for (const QString &arg : args.mid(1)) {
+ if (!arg.startsWith(QLatin1Char('-')))
+ return QUrl::fromUserInput(arg);
+ }
+ return QUrl(QStringLiteral("https://www.qt.io"));
}
int main(int argc, char **argv)
@@ -72,9 +74,7 @@ int main(int argc, char **argv)
QWebEngineSettings::defaultSettings()->setAttribute(QWebEngineSettings::PluginsEnabled, true);
- QUrl url = getCommandLineUrlArgument();
- if (!url.isValid())
- url = QStringLiteral("https://www.qt.io");
+ QUrl url = commandLineUrlArgument();
Browser browser;
BrowserWindow *window = browser.createWindow();
diff --git a/examples/webenginewidgets/simplebrowser/tabwidget.cpp b/examples/webenginewidgets/simplebrowser/tabwidget.cpp
index 1c6cfbe00..e7376c7a5 100644
--- a/examples/webenginewidgets/simplebrowser/tabwidget.cpp
+++ b/examples/webenginewidgets/simplebrowser/tabwidget.cpp
@@ -207,6 +207,9 @@ WebView *TabWidget::createBackgroundTab()
setupView(webView);
int index = addTab(webView, tr("(Untitled)"));
setTabIcon(index, webView->favIcon());
+ // Workaround for QTBUG-61770
+ webView->resize(currentWidget()->size());
+ webView->show();
return webView;
}