<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/70cfeb3c63f8ebda03cbe107edc238c3c71b4709">https://github.com/macports/macports-ports/commit/70cfeb3c63f8ebda03cbe107edc238c3c71b4709</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 70cfeb3c63f KeePassXC: update to 2.7.5
</span>70cfeb3c63f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 70cfeb3c63f8ebda03cbe107edc238c3c71b4709
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Thu May 18 08:58:32 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> KeePassXC: update to 2.7.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - remove patches merged upstream
</span><span style='display:block; white-space:pre;color:#404040;'> - update keepassxc-devel to latest commit of 'release/2.7.x' branch
</span>---
security/KeePassXC/Portfile | 33 +++++------
.../{devel => }/add_support_for_old_macos-2.diff | 0
.../KeePassXC/files/add_support_for_qt5.6.diff | 38 ------------
...owFlags-instead-of-setWindowFlag-on-Qt-5..patch | 69 ----------------------
.../devel/0002-Fix-build-failure-with-Qt5.6.patch | 38 ------------
5 files changed, 14 insertions(+), 164 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/Portfile b/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e6633683138..57857bd425e 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ license_noconflict openssl openssl10 openssl11 openssl3
</span>
if {${subport} eq ${name}} {
# stable
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup keepassxreboot keepassxc 2.7.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup keepassxreboot keepassxc 2.7.5
</span> revision 0
github.tarball_from releases
distname keepassxc-${version}-src
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,39 +44,33 @@ if {${subport} eq ${name}} {
</span>
# See keepassxc-${version}-src.tar.xz.DIGEST on upstream GitHub releases page for SHA256 sums
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8370c30c621512817c30517a13c0c14e00121526 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 560052961da0389327e759171f660230dfa4e0f4e1fab6139600fb85c6e5dece \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8957372 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 aa94b41f8052ee7d587f3990a62495c035b03b75 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ede24800901816c49569aa4f8bc7180a40cb8b554617fa2a2a2653caac13000c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8706996 \
</span> ${distname}${extract.suffix}.sig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a4e2dc1f2f7a85d6e34207681e4adcf5217a8c60 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4f2b2b3c7c809668e4b3529bd07a74364d9dba56508f6f65e93801301729429e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 636e500b23a5eb2411279754dc8fbbe52bcc2ba5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 76440a2b0049a71dbb7bc67330cd8e410e3ca0f9dafd7069140e93c30f7184f7 \
</span> size 488
gpg_verify.use_gpg_verification \
yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append add_support_for_qt5.6.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> } else {
# devel subport
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup keepassxreboot keepassxc 28e2806e077a2871dbb4f7e960febfc3653b6719
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup keepassxreboot keepassxc 37dabd2561c33d7c0e66bba6ab0883bb55e90cf1
</span> set githash [string range ${github.version} 0 6]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20230416.git${githash}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20230514.git${githash}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
conflicts KeePassXC
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 f7368e399fd091a089878257c7bdc875115fd33e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 04b44a3bf60e57b50577d755a470524ca45b919fa48082a1a23db0ec38813ed1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10718196
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 16d79aa775a0dc6d8cf32015a3dc7131a2e13163 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 05fb0c84e426f33bacd41f6809d52c5bc758dace52b41c58001385a26bed89c3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10967053
</span>
gpg_verify.use_gpg_verification \
no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append devel/add_support_for_old_macos-2.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- devel/0001-use-setWindowFlags-instead-of-setWindowFlag-on-Qt-5..patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- devel/0002-Fix-build-failure-with-Qt5.6.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
if {[option gpg_verify.use_gpg_verification]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,7 +104,8 @@ depends_lib-append port:argon2 \
</span>
patchfiles-append patch-no-deployqt.diff \
patch-no-findpackage-path.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- add_support_for_old_macos.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_support_for_old_macos.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_support_for_old_macos-2.diff
</span>
# KeePassXC uses -fstack-protector-strong on Clang [1]. That flag is not
# available until clang 602 [2] or upstream clang 3.5 [3]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/add_support_for_old_macos-2.diff b/security/KeePassXC/files/add_support_for_old_macos-2.diff
</span>similarity index 100%
rename from security/KeePassXC/files/devel/add_support_for_old_macos-2.diff
rename to security/KeePassXC/files/add_support_for_old_macos-2.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/add_support_for_qt5.6.diff b/security/KeePassXC/files/add_support_for_qt5.6.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 23878330aeb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/add_support_for_qt5.6.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 13 Nov 2022 09:38:48 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix build failure with Qt5.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-On macos 10.7 which uses Qt 5.6, build fails with this error:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-src/gui/tag/TagView.cpp:79:38: error: no matching constructor for initialization of 'QAction'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto action = menu.exec({new QAction(icons()->icon("trash"), tr("Remove Search"))}, mapToGlobal(pos));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This is because in Qt 5.6, the 3rd argument is not optional. Starting from Qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-5.7 the default value for the 3rd argument is nullptr, so setting it to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-nullptr.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://doc.qt.io/archives/qt-5.6/qaction.html#QAction-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://doc.qt.io/archives/qt-5.7/qaction.html#QAction-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream doesn't want to merge patches to build on versions prior to macos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-10.13, so this patch is not forwarded upstream.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/tag/TagView.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/tag/TagView.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -76,14 +76,14 @@ void TagView::contextMenuRequested(const QPoint& pos)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (type == TagModel::SAVED_SEARCH) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Allow deleting saved searches
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMenu menu;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto action = menu.exec({new QAction(icons()->icon("trash"), tr("Remove Search"))}, mapToGlobal(pos));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto action = menu.exec({new QAction(icons()->icon("trash"), tr("Remove Search"), nullptr)}, mapToGlobal(pos));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (action) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_db->metadata()->deleteSavedSearch(index.data(Qt::DisplayRole).toString());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (type == TagModel::TAG) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Allow removing tags from all entries in a database
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMenu menu;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto action = menu.exec({new QAction(icons()->icon("trash"), tr("Remove Tag"))}, mapToGlobal(pos));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto action = menu.exec({new QAction(icons()->icon("trash"), tr("Remove Tag"), nullptr)}, mapToGlobal(pos));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (action) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto tag = index.data(Qt::DisplayRole).toString();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto ans = MessageBox::question(this,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/0001-use-setWindowFlags-instead-of-setWindowFlag-on-Qt-5..patch b/security/KeePassXC/files/devel/0001-use-setWindowFlags-instead-of-setWindowFlag-on-Qt-5..patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 271eb7c7bb2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/devel/0001-use-setWindowFlags-instead-of-setWindowFlag-on-Qt-5..patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,69 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 1160c25898b84f5c8477c3ab08c78a24c3b48b2e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 2 May 2023 10:04:37 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/2] use setWindowFlags() instead of setWindowFlag on Qt<5.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-src/gui/CloneDialog.cpp:32:5: error: use of undeclared identifier 'setWindowFlag'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setWindowFlag(Qt::WindowContextHelpButtonHint, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-void QWidget::setWindowFlag(Qt::WindowType flag, bool on = true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---> This function was introduced in Qt 5.9.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/CloneDialog.cpp | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/DatabaseOpenDialog.cpp | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/TotpSetupDialog.cpp | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 12 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/gui/CloneDialog.cpp b/src/gui/CloneDialog.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4ba5856b..72199ae5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/CloneDialog.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/CloneDialog.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,7 +29,11 @@ CloneDialog::CloneDialog(DatabaseWidget* parent, Database* db, Entry* entry)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_ui->setupUi(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- window()->layout()->setSizeConstraint(QLayout::SetFixedSize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setWindowFlag(Qt::WindowContextHelpButtonHint, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setAttribute(Qt::WA_DeleteOnClose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/gui/DatabaseOpenDialog.cpp b/src/gui/DatabaseOpenDialog.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index acf90504..366f7a9c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/DatabaseOpenDialog.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/DatabaseOpenDialog.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,11 @@ DatabaseOpenDialog::DatabaseOpenDialog(QWidget* parent)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setWindowTitle(tr("Unlock Database - KeePassXC"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setWindowFlags(Qt::Dialog);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setWindowFlag(Qt::WindowContextHelpButtonHint, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef Q_OS_LINUX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Linux requires this to overcome some Desktop Environments (also no Quick Unlock)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/gui/TotpSetupDialog.cpp b/src/gui/TotpSetupDialog.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 875dfcfd..d33d9ce3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/TotpSetupDialog.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/TotpSetupDialog.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,7 +29,11 @@ TotpSetupDialog::TotpSetupDialog(QWidget* parent, Entry* entry)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_ui->setupUi(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setAttribute(Qt::WA_DeleteOnClose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setWindowFlag(Qt::WindowContextHelpButtonHint, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setFixedSize(sizeHint());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.30.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/0002-Fix-build-failure-with-Qt5.6.patch b/security/KeePassXC/files/devel/0002-Fix-build-failure-with-Qt5.6.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7cda5517ce9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/devel/0002-Fix-build-failure-with-Qt5.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 8c8a155f50a4804c658b6976082fc0aac1dd5a09 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 2 May 2023 10:07:43 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/2] Fix build failure with Qt5.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-With Qt 5.6, build fails with error below.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This is because in Qt 5.6, the 3rd argument is not optional. Starting from Qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-5.7 the default value for the 3rd argument is nullptr, so setting it to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-nullptr.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://doc.qt.io/archives/qt-5.6/qaction.html#QAction-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://doc.qt.io/archives/qt-5.7/qaction.html#QAction-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Error:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-src/autotype/AutoTypeSelectDialog.cpp:330:34: error: no matching constructor for initialization of 'QAction'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto typeVirtualAction = new QAction(icons()->icon("auto-type"), tr("Use Virtual Keyboard"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/autotype/AutoTypeSelectDialog.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/autotype/AutoTypeSelectDialog.cpp b/src/autotype/AutoTypeSelectDialog.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 71542438..1e767d79 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/autotype/AutoTypeSelectDialog.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/autotype/AutoTypeSelectDialog.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -327,7 +327,7 @@ void AutoTypeSelectDialog::buildActionMenu()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- });
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto typeVirtualAction = new QAction(icons()->icon("auto-type"), tr("Use Virtual Keyboard"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto typeVirtualAction = new QAction(icons()->icon("auto-type"), tr("Use Virtual Keyboard"), nullptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_actionMenu->insertAction(copyUsernameAction, typeVirtualAction);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typeVirtualAction->setShortcut(Qt::CTRL + Qt::Key_4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect(typeVirtualAction, &QAction::triggered, this, [&] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.30.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>