Update upstream source from tag 'upstream/3.3.3+dfsg1'

Update to upstream version '3.3.3+dfsg1'
with Debian dir 9a301fff4922aed2fec0c04c7d011947168c42f1

1 files changed, 7 insertions, 2 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.cpp b/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.cpp
index c67cc73..1203582 100644
--- a/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.cpp
@@ -15,8 +15,13 @@ ExtActionContainer::ExtActionContainer()
 {
     actionIdMapper = new QSignalMapper();
 
-    // We need to explicitly cast QSignalMapper::mapped to tell which overloaded version of function we want
-    QObject::connect(actionIdMapper, static_cast<void (QSignalMapper::*)(int)>(&QSignalMapper::mapped),
+    QObject::connect(actionIdMapper,
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+                     &QSignalMapper::mappedInt,
+#else
+                     // We need to explicitly cast QSignalMapper::mapped to tell which overloaded version of function we want
+                     static_cast<void (QSignalMapper::*)(int)>(&QSignalMapper::mapped),
+#endif
                      [=](int action) {refreshShortcut(action);});
     instances << this;
 }