From c3226bd5cc6bf009d2fb3c233a09f3ef5cf618e9 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Mon, 25 Mar 2019 12:40:36 +0100 Subject: configure: add linker flags for xkbcommon* when pkg-config not present Without this, xkbcommon feature would not be detected even if all xkbcommon dev libs are present. Change-Id: Ic247461dda9e7ddfed547708cccaad88f123903b Reviewed-by: Joerg Bornemann --- src/gui/configure.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') 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": { -- cgit v1.2.3 From 243c8403903781a28832e0bf34ce962058300e99 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Tue, 26 Mar 2019 00:02:22 +0100 Subject: Drag'n'Drop: fix dnd regression DragEnter events always should start with the default state, which is accepted = false. This was a copy-and-paste error introduced by f8944a7f07112c85dc4f66848cabb490514cd28e. Fixes: QTBUG-73977 Change-Id: I34b3ea97c9b4f4fc040a9e6f1befd6124533361d Reviewed-by: Friedemann Kleint --- src/widgets/kernel/qwidgetwindow.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src') 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()); -- cgit v1.2.3 From ae5db669e8989fe793949346d8061c67e5ec31cd Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 28 Mar 2019 10:12:12 +0100 Subject: Doc: Improve WinTab license information Do not categorize the license anymore as 'Public Domain', because the actual text is not explicit on whether it allows modifications. Instead show the original license text. Also remove the Homepage link, which now just displays (arguably outdated) information about patents. Finally, do not misuse the "Version" field for metadata information, use the newly introduced "PackageComment" field instead. [ChangeLog][Third-Party Code] Changed classification of the wintab license from Public Domain to Custom. Fixes: QTBUG-74453 Change-Id: Ibae36be1deee3b9c498c45d03ed741c3d5ff630c Reviewed-by: Alex Blasche Reviewed-by: Lars Knoll --- src/3rdparty/wintab/LICENSE.txt | 2 ++ src/3rdparty/wintab/qt_attribution.json | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 src/3rdparty/wintab/LICENSE.txt (limited to 'src') 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." } -- cgit v1.2.3