Merge remote-tracking branch 'origin/5.12.3' into 5.12

Change-Id: Id60d508c0f25fd5e67be07daafd2d4c56ae73934

4 files changed, 9 insertions, 7 deletions

diff --git a/src/3rdparty/wintab/LICENSE.txt b/src/3rdparty/wintab/LICENSE.txt
new file mode 100644
index 0000000000..6c03ad2aff
--- /dev/null
+++ b/src/3rdparty/wintab/LICENSE.txt
@@ -0,0 +1,2 @@
+The text and information contained in this file may be freely used,
+copied, or distributed without compensation or licensing restrictions.
diff --git a/src/3rdparty/wintab/qt_attribution.json b/src/3rdparty/wintab/qt_attribution.json
index f0c9b49841..1b9c55552e 100644
--- a/src/3rdparty/wintab/qt_attribution.json
+++ b/src/3rdparty/wintab/qt_attribution.json
@@ -5,9 +5,9 @@
     "QtUsage": "Used in the Qt platform plugin for Windows. Configure with -no-feature-tabletevent to avoid.",
 
     "Description": "Wintab is a de facto API for pointing devices on Windows.",
-    "Version": "Upstream no longer offers updates; treat as final",
-    "Homepage": "http://www.pointing.com/Wintab.html",
-    "License": "Public Domain",
+    "PackageComment": "Upstream http://www.pointing.com/Wintab.html no longer offers updates; treat as final",
+    "License": "Custom License",
+    "LicenseFile": "LICENSE.txt",
     "LicenseId": "NONE",
     "Copyright": "Copyright 1991-1998 by LCS/Telegraphics."
 }
diff --git a/src/gui/configure.json b/src/gui/configure.json
index e4f25ab313..6fdcd562a7 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -764,7 +764,8 @@
             },
             "headers": [ "xkbcommon/xkbcommon.h" ],
             "sources": [
-                { "type": "pkgConfig", "args": "xkbcommon >= 0.5.0" }
+                { "type": "pkgConfig", "args": "xkbcommon >= 0.5.0" },
+                "-lxkbcommon"
             ]
         },
         "xkbcommon_x11": {
@@ -774,7 +775,8 @@
             },
             "headers": [ "xkbcommon/xkbcommon-x11.h" ],
             "sources": [
-                { "type": "pkgConfig", "args": "xkbcommon-x11" }
+                { "type": "pkgConfig", "args": "xkbcommon-x11" },
+                "-lxkbcommon -lxkbcommon-x11"
             ]
         },
         "xrender": {
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
index e9b749d7c2..fbc71cd0ea 100644
--- a/src/widgets/kernel/qwidgetwindow.cpp
+++ b/src/widgets/kernel/qwidgetwindow.cpp
@@ -878,8 +878,6 @@ void QWidgetWindow::handleDragEnterEvent(QDragEnterEvent *event, QWidget *widget
     const QPoint mapped = widget->mapFromGlobal(m_widget->mapToGlobal(event->pos()));
     QDragEnterEvent translated(mapped, event->possibleActions(), event->mimeData(),
                                event->mouseButtons(), event->keyboardModifiers());
-    translated.setDropAction(event->dropAction());
-    translated.setAccepted(event->isAccepted());
     QGuiApplication::forwardEvent(m_dragTarget, &translated, event);
     event->setAccepted(translated.isAccepted());
     event->setDropAction(translated.dropAction());