diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-05-12 12:42:20 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-05-14 17:35:40 +0200 |
commit | e8c14a21bde3ccd629ff9aa40460d9b09582883b (patch) | |
tree | 6746481e25875d2c0de35dc8e360492d8bcb3814 /examples/webenginewidgets | |
parent | 10e66c6dd0b8a8dd17252d6408c13b689fac6995 (diff) |
Update 'dev' dependencies
Including three compile fixes.
Change-Id: I497ed359d229e869b67aa10e4114a37ceec4be97
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples/webenginewidgets')
-rw-r--r-- | examples/webenginewidgets/cookiebrowser/mainwindow.cpp | 2 | ||||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/tabwidget.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/webenginewidgets/cookiebrowser/mainwindow.cpp b/examples/webenginewidgets/cookiebrowser/mainwindow.cpp index 970381d4d..66e6988d8 100644 --- a/examples/webenginewidgets/cookiebrowser/mainwindow.cpp +++ b/examples/webenginewidgets/cookiebrowser/mainwindow.cpp @@ -87,7 +87,7 @@ QNetworkCookie CookieDialog::cookie() cookie.setDomain(m_domainLineEdit->text()); cookie.setName(m_nameLineEdit->text().toLatin1()); cookie.setValue(m_valueLineEdit->text().toLatin1()); - cookie.setExpirationDate(QDateTime(m_dateEdit->date())); + cookie.setExpirationDate(QDateTime(m_dateEdit->date(), QTime::currentTime())); cookie.setPath(m_pathLineEdit->text()); cookie.setSecure(m_isSecureComboBox->currentText() == tr("yes")); cookie.setHttpOnly(m_isHttpOnlyComboBox->currentText() == tr("yes")); diff --git a/examples/webenginewidgets/simplebrowser/tabwidget.cpp b/examples/webenginewidgets/simplebrowser/tabwidget.cpp index d7a69e61f..6469d48b3 100644 --- a/examples/webenginewidgets/simplebrowser/tabwidget.cpp +++ b/examples/webenginewidgets/simplebrowser/tabwidget.cpp @@ -82,7 +82,7 @@ TabWidget::TabWidget(QWebEngineProfile *profile, QWidget *parent) QPixmap pixmap(QStringLiteral(":ninja.png")); icon->setPixmap(pixmap.scaledToHeight(tabBar->height())); setStyleSheet(QStringLiteral("QTabWidget::tab-bar { left: %1px; }"). - arg(icon->pixmap()->width())); + arg(icon->pixmap().width())); } } |