summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-05-12 12:42:20 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-05-14 17:35:40 +0200
commite8c14a21bde3ccd629ff9aa40460d9b09582883b (patch)
tree6746481e25875d2c0de35dc8e360492d8bcb3814 /examples
parent10e66c6dd0b8a8dd17252d6408c13b689fac6995 (diff)
Update 'dev' dependencies
Including three compile fixes. Change-Id: I497ed359d229e869b67aa10e4114a37ceec4be97 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/pdfwidgets/pdfviewer/zoomselector.cpp6
-rw-r--r--examples/pdfwidgets/pdfviewer/zoomselector.h2
-rw-r--r--examples/webenginewidgets/cookiebrowser/mainwindow.cpp2
-rw-r--r--examples/webenginewidgets/simplebrowser/tabwidget.cpp2
4 files changed, 6 insertions, 6 deletions
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()));
}
}