From e8c14a21bde3ccd629ff9aa40460d9b09582883b Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 12 May 2020 12:42:20 +0200
Subject: Update 'dev' dependencies

Including three compile fixes.

Change-Id: I497ed359d229e869b67aa10e4114a37ceec4be97
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 dependencies.yaml                                      | 12 ++++++------
 examples/pdfwidgets/pdfviewer/zoomselector.cpp         |  6 +++---
 examples/pdfwidgets/pdfviewer/zoomselector.h           |  2 +-
 examples/webenginewidgets/cookiebrowser/mainwindow.cpp |  2 +-
 examples/webenginewidgets/simplebrowser/tabwidget.cpp  |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dependencies.yaml b/dependencies.yaml
index 41e001996..9f53182b5 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,6 +1,6 @@
 dependencies:
   ../qtdeclarative:
-    ref: 399ebb5635efc897d29efba90f92f931843b266a
+    ref: b2f8d680d65b987ab88c41a2f76e6becbad62864
     required: true
 #  ../qtlocation:
 #    ref: a8793c6d9695498b3a53793f21859421262b4541
@@ -9,11 +9,11 @@ dependencies:
 #    ref: 59749d56d666a6687fcedc2f7892080467db8574
 #    required: false
   ../qtquickcontrols2:
-    ref: b60edab10cd5e5cffde22382eccf3d1c21e258c9
+    ref: dd90f7be501a9545e74aaecacba1d469a8fad5aa
     required: false
   ../qttools:
-    ref: ae93fab03d3192f1ed32471a58f58e34f757c1cd
+    ref: c21ea2f13eae86958caf7e80a60a74fe182aaa7e
+    required: false
+  ../qtwebchannel:
+    ref: 8554d71f47f85b111f095ea8f25c3a72c5cae32e
     required: false
-#  ../qtwebchannel:
-#    ref: 432ed9647818ca652eec64a24860823ecc326f4a
-#    required: false
diff --git a/examples/pdfwidgets/pdfviewer/zoomselector.cpp b/examples/pdfwidgets/pdfviewer/zoomselector.cpp
index e38140e67..a4d596ab7 100644
--- a/examples/pdfwidgets/pdfviewer/zoomselector.cpp
+++ b/examples/pdfwidgets/pdfviewer/zoomselector.cpp
@@ -57,11 +57,11 @@ ZoomSelector::ZoomSelector(QWidget *parent)
     addItem(QLatin1String("200%"));
     addItem(QLatin1String("400%"));
 
-    connect(this, &QComboBox::currentIndexChanged,
+    connect(this, &QComboBox::currentTextChanged,
             this, &ZoomSelector::onCurrentTextChanged);
 
     connect(lineEdit(), &QLineEdit::editingFinished,
-            this, [this](){onCurrentTextChanged(0, lineEdit()->text()); });
+            this, [this](){onCurrentTextChanged(lineEdit()->text()); });
 }
 
 void ZoomSelector::setZoomFactor(qreal zoomFactor)
@@ -74,7 +74,7 @@ void ZoomSelector::reset()
     setCurrentIndex(8); // 100%
 }
 
-void ZoomSelector::onCurrentTextChanged(int, const QString &text)
+void ZoomSelector::onCurrentTextChanged(const QString &text)
 {
     if (text == QLatin1String("Fit Width")) {
         emit zoomModeChanged(QPdfView::FitToWidth);
diff --git a/examples/pdfwidgets/pdfviewer/zoomselector.h b/examples/pdfwidgets/pdfviewer/zoomselector.h
index 0f27bafb4..c58d09970 100644
--- a/examples/pdfwidgets/pdfviewer/zoomselector.h
+++ b/examples/pdfwidgets/pdfviewer/zoomselector.h
@@ -57,7 +57,7 @@ signals:
     void zoomFactorChanged(qreal zoomFactor);
 
 private slots:
-    void onCurrentTextChanged(int, const QString &text);
+    void onCurrentTextChanged(const QString &text);
 };
 
 #endif // ZOOMSELECTOR_H
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()));
     }
 }
 
-- 
cgit v1.2.3