mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-25 17:55:21 +00:00
Merge pull request #107713 from ttuegel/staging-20.09--qt-5.15.2
[20.09] Qt 5.15.2
This commit is contained in:
Thomas Tuegel
@@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation, lib, kdepimTeam,
|
||||
mkDerivation, lib, kdepimTeam, fetchpatch,
|
||||
extra-cmake-modules, kdoctools,
|
||||
akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs,
|
||||
kholidays, kidentitymanagement, kmime, pimcommon, qttools,
|
||||
@@ -11,6 +11,13 @@ mkDerivation {
|
||||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||
maintainers = kdepimTeam;
|
||||
};
|
||||
patches = [
|
||||
# Patch for Qt 5.15.2 until version 20.12.0
|
||||
(fetchpatch {
|
||||
url = "https://invent.kde.org/pim/calendarsupport/-/commit/b4193facb223bd5b73a65318dec8ced51b66adf7.patch";
|
||||
sha256 = "sha256:1da11rqbxxrl06ld3avc41p064arz4n6w5nxq8r008v8ws3s64dy";
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation, lib, kdepimTeam,
|
||||
mkDerivation, lib, kdepimTeam, fetchpatch,
|
||||
extra-cmake-modules, kdoctools,
|
||||
akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion,
|
||||
kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts,
|
||||
@@ -13,6 +13,13 @@ mkDerivation {
|
||||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||
maintainers = kdepimTeam;
|
||||
};
|
||||
patches = [
|
||||
# Patch for Qt 5.15.2 until version 20.12.0
|
||||
(fetchpatch {
|
||||
url = "https://invent.kde.org/pim/kaddressbook/-/commit/8aee8d40ae2a1c920d3520163d550d3b49720226.patch";
|
||||
sha256 = "sha256:0dsy119cd5w9khiwgk6fb7xnjzmj94rfphf327k331lf15zq4853";
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2
|
||||
kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2,
|
||||
fetchpatch
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@@ -11,5 +12,15 @@ mkDerivation {
|
||||
buildInputs = [
|
||||
kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Portaway from Obsolete methods of QPrinter
|
||||
# Part of v20.12.0
|
||||
url = "https://invent.kde.org/sdk/kompare/-/commit/68d3eee36c48a2f44ccfd3f9e5a36311b829104b.patch";
|
||||
sha256 = "B2i5n5cUDjCqTEF0OyTb1+LhPa5yWCnFycwijf35kwU=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
}
|
||||
|
||||
@@ -1,14 +1,21 @@
|
||||
{
|
||||
mkDerivation, lib, extra-cmake-modules, qtbase
|
||||
, qtdeclarative, kconfig, kcoreaddons, ki18n, kio, kirigami2
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
name = "purpose";
|
||||
meta = { maintainers = [ lib.maintainers.bkchr ]; };
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/KDE/purpose/commit/b3842a0941858792e997bb35b679a3fdf3ef54ca.patch";
|
||||
sha256 = "14brpryrrfrli1amk4flpnd03wr4zyycpiirndn9sjz0krqlgf3j";
|
||||
})
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase qtdeclarative kconfig kcoreaddons
|
||||
qtbase qtdeclarative kconfig kcoreaddons
|
||||
ki18n kio kirigami2
|
||||
];
|
||||
}
|
||||
|
||||
@@ -57,6 +57,12 @@ let
|
||||
|
||||
# Downgrade minimal required SDK to 10.12
|
||||
./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
|
||||
./qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch
|
||||
./qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch
|
||||
./qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch
|
||||
./qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch
|
||||
./qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch
|
||||
./qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch
|
||||
./qtbase.patch.d/qtbase-sdk-10.12-mac.patch
|
||||
]
|
||||
++ [
|
||||
@@ -73,17 +79,7 @@ let
|
||||
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||
qtscript = [ ./qtscript.patch ];
|
||||
qtserialport = [ ./qtserialport.patch ];
|
||||
qtwebengine = [
|
||||
# Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599
|
||||
(fetchpatch {
|
||||
name = "qtwebengine-bison-3.7-build.patch";
|
||||
url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599";
|
||||
sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy";
|
||||
stripLen = 1;
|
||||
extraPrefix = "src/3rdparty/";
|
||||
})
|
||||
]
|
||||
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
|
||||
qtwebengine = optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
|
||||
qtwebkit = [ ./qtwebkit.patch ]
|
||||
++ optionals stdenv.isDarwin [
|
||||
./qtwebkit-darwin-no-readline.patch
|
||||
|
||||
@@ -1 +1 @@
|
||||
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/ )
|
||||
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/ )
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
From f156c35975e7844d2369ec5a6633ee40ec56f17a Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
|
||||
Date: Mon, 7 Dec 2020 12:32:29 -0500
|
||||
Subject: [PATCH 1/6] Revert "QCocoaDrag - set image only on the first drag
|
||||
item"
|
||||
|
||||
This reverts commit 7ee9bfc158a290776f622f62d0202220c6d159bc.
|
||||
---
|
||||
src/plugins/platforms/cocoa/qcocoadrag.mm | 9 ++-------
|
||||
1 file changed, 2 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
|
||||
index 4bd1b129bd..a506126c72 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
|
||||
@@ -217,18 +217,13 @@ bool QCocoaDrag::maybeDragMultipleItems()
|
||||
// 0. We start from URLs, which can be actually in a list (thus technically
|
||||
// only ONE item in the pasteboard. The fact it's only one does not help, we are
|
||||
// still getting an exception because of the number of items/images mismatch ...
|
||||
- // We only set the image for the first item and nil for the rest, the image already
|
||||
- // contains a combined picture for all urls we drag.
|
||||
- auto imageOrNil = dragImage;
|
||||
for (const auto &qtUrl : qtUrls) {
|
||||
NSURL *nsUrl = qtUrl.toNSURL();
|
||||
auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:nsUrl] autorelease];
|
||||
const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
|
||||
dragImage.size.width,
|
||||
dragImage.size.height);
|
||||
-
|
||||
- [newItem setDraggingFrame:itemFrame contents:imageOrNil];
|
||||
- imageOrNil = nil;
|
||||
+ [newItem setDraggingFrame:itemFrame contents:dragImage];
|
||||
[dragItems addObject:newItem];
|
||||
}
|
||||
// 1. Repeat for non-url items, if any:
|
||||
@@ -237,7 +232,7 @@ bool QCocoaDrag::maybeDragMultipleItems()
|
||||
const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
|
||||
dragImage.size.width,
|
||||
dragImage.size.height);
|
||||
- [newItem setDraggingFrame:itemFrame contents:imageOrNil];
|
||||
+ [newItem setDraggingFrame:itemFrame contents:dragImage];
|
||||
[dragItems addObject:newItem];
|
||||
}
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 9aaac67e3c3bf40ef3efc3b07b1655f72c8c54aa Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
|
||||
Date: Mon, 7 Dec 2020 12:32:31 -0500
|
||||
Subject: [PATCH 2/6] Revert "QCocoaDrag::drag - make sure clipboard is ours
|
||||
and populated"
|
||||
|
||||
This reverts commit 720e2e0c92ca6635c5f05f318770a70cf653c1c7.
|
||||
---
|
||||
src/plugins/platforms/cocoa/qcocoadrag.mm | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
|
||||
index a506126c72..c6ee4323ce 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
|
||||
@@ -131,10 +131,6 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
|
||||
m_drag = o;
|
||||
m_executed_drop_action = Qt::IgnoreAction;
|
||||
|
||||
- QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND);
|
||||
- m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));
|
||||
- dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest);
|
||||
-
|
||||
if (maybeDragMultipleItems())
|
||||
return m_executed_drop_action;
|
||||
|
||||
@@ -143,6 +139,10 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
|
||||
NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()];
|
||||
Q_ASSERT(dragImage);
|
||||
|
||||
+ QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND);
|
||||
+ m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));
|
||||
+ dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest);
|
||||
+
|
||||
NSPoint event_location = [m_lastEvent locationInWindow];
|
||||
NSWindow *theWindow = [m_lastEvent window];
|
||||
Q_ASSERT(theWindow);
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
From d1626c55d10537274c6f365855342a1c619a4c3a Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
|
||||
Date: Mon, 7 Dec 2020 12:32:32 -0500
|
||||
Subject: [PATCH 3/6] Revert "QCocoaDrag::maybeDragMultipleItems - fix
|
||||
erroneous size check"
|
||||
|
||||
This reverts commit b8a03411784803c07ecc1f769860756d6fdc04cd.
|
||||
---
|
||||
src/plugins/platforms/cocoa/qcocoadrag.mm | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
|
||||
index c6ee4323ce..ab6863a432 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
|
||||
@@ -187,7 +187,7 @@ bool QCocoaDrag::maybeDragMultipleItems()
|
||||
const auto &qtUrls = m_drag->mimeData()->urls();
|
||||
NSPasteboard *dragBoard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
|
||||
|
||||
- if (qtUrls.size() <= 1) {
|
||||
+ if (int(dragBoard.pasteboardItems.count) == 1 && qtUrls.size() <= 1) {
|
||||
// Good old -dragImage: works perfectly for this ...
|
||||
return false;
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -0,0 +1,192 @@
|
||||
From d5c155a9f3ff38e28ac073f6df43175724ebc290 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
|
||||
Date: Mon, 7 Dec 2020 12:32:34 -0500
|
||||
Subject: [PATCH 4/6] Revert "QCocoaDrag - avoid using the deprecated API if
|
||||
possible"
|
||||
|
||||
This reverts commit 8481a9fc974a1f1dd44a9f82decb18fe2290689f.
|
||||
---
|
||||
src/plugins/platforms/cocoa/qcocoadrag.h | 6 --
|
||||
src/plugins/platforms/cocoa/qcocoadrag.mm | 90 -------------------
|
||||
.../platforms/cocoa/qnsview_dragging.mm | 9 +-
|
||||
3 files changed, 1 insertion(+), 104 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.h b/src/plugins/platforms/cocoa/qcocoadrag.h
|
||||
index 975741c270..5a5b985c6e 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoadrag.h
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoadrag.h
|
||||
@@ -48,8 +48,6 @@
|
||||
#include <QtGui/private/qdnd_p.h>
|
||||
#include <QtGui/private/qinternalmimedata_p.h>
|
||||
|
||||
-#include <QtCore/qeventloop.h>
|
||||
-
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QCocoaDrag : public QPlatformDrag
|
||||
@@ -71,15 +69,11 @@ public:
|
||||
void setLastMouseEvent(NSEvent *event, NSView *view);
|
||||
|
||||
void setAcceptedAction(Qt::DropAction act);
|
||||
- void exitDragLoop();
|
||||
private:
|
||||
QDrag *m_drag;
|
||||
NSEvent *m_lastEvent;
|
||||
NSView *m_lastView;
|
||||
Qt::DropAction m_executed_drop_action;
|
||||
- QEventLoop internalDragLoop;
|
||||
-
|
||||
- bool maybeDragMultipleItems();
|
||||
|
||||
QPixmap dragPixmap(QDrag *drag, QPoint &hotSpot) const;
|
||||
};
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
|
||||
index ab6863a432..b4a16ab912 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
|
||||
@@ -44,9 +44,6 @@
|
||||
#include <QtWidgets/qwidget.h>
|
||||
#endif
|
||||
#include <QtGui/private/qcoregraphics_p.h>
|
||||
-#include <QtCore/qsysinfo.h>
|
||||
-
|
||||
-#include <vector>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
@@ -131,9 +128,6 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
|
||||
m_drag = o;
|
||||
m_executed_drop_action = Qt::IgnoreAction;
|
||||
|
||||
- if (maybeDragMultipleItems())
|
||||
- return m_executed_drop_action;
|
||||
-
|
||||
QPoint hotSpot = m_drag->hotSpot();
|
||||
QPixmap pm = dragPixmap(m_drag, hotSpot);
|
||||
NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()];
|
||||
@@ -164,95 +158,11 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
|
||||
return m_executed_drop_action;
|
||||
}
|
||||
|
||||
-bool QCocoaDrag::maybeDragMultipleItems()
|
||||
-{
|
||||
- Q_ASSERT(m_drag && m_drag->mimeData());
|
||||
- Q_ASSERT(m_executed_drop_action == Qt::IgnoreAction);
|
||||
-
|
||||
- if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSMojave) {
|
||||
- // -dragImage: stopped working in 10.14 first.
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- const QMacAutoReleasePool pool;
|
||||
-
|
||||
- NSWindow *theWindow = [m_lastEvent window];
|
||||
- Q_ASSERT(theWindow);
|
||||
-
|
||||
- if (![theWindow.contentView respondsToSelector:@selector(draggingSession:sourceOperationMaskForDraggingContext:)])
|
||||
- return false;
|
||||
-
|
||||
- auto *sourceView = static_cast<NSView<NSDraggingSource>*>(theWindow.contentView);
|
||||
-
|
||||
- const auto &qtUrls = m_drag->mimeData()->urls();
|
||||
- NSPasteboard *dragBoard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
|
||||
-
|
||||
- if (int(dragBoard.pasteboardItems.count) == 1 && qtUrls.size() <= 1) {
|
||||
- // Good old -dragImage: works perfectly for this ...
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- std::vector<NSPasteboardItem *> nonUrls;
|
||||
- for (NSPasteboardItem *item in dragBoard.pasteboardItems) {
|
||||
- bool isUrl = false;
|
||||
- for (NSPasteboardType type in item.types) {
|
||||
- using NSStringRef = NSString *;
|
||||
- if ([type isEqualToString:NSStringRef(kUTTypeFileURL)]) {
|
||||
- isUrl = true;
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- if (!isUrl)
|
||||
- nonUrls.push_back(item);
|
||||
- }
|
||||
-
|
||||
- QPoint hotSpot = m_drag->hotSpot();
|
||||
- const auto pixmap = dragPixmap(m_drag, hotSpot);
|
||||
- NSImage *dragImage = [NSImage imageFromQImage:pixmap.toImage()];
|
||||
- Q_ASSERT(dragImage);
|
||||
-
|
||||
- NSMutableArray<NSDraggingItem *> *dragItems = [[[NSMutableArray alloc] init] autorelease];
|
||||
- const NSPoint itemLocation = m_drag->hotSpot().toCGPoint();
|
||||
- // 0. We start from URLs, which can be actually in a list (thus technically
|
||||
- // only ONE item in the pasteboard. The fact it's only one does not help, we are
|
||||
- // still getting an exception because of the number of items/images mismatch ...
|
||||
- for (const auto &qtUrl : qtUrls) {
|
||||
- NSURL *nsUrl = qtUrl.toNSURL();
|
||||
- auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:nsUrl] autorelease];
|
||||
- const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
|
||||
- dragImage.size.width,
|
||||
- dragImage.size.height);
|
||||
- [newItem setDraggingFrame:itemFrame contents:dragImage];
|
||||
- [dragItems addObject:newItem];
|
||||
- }
|
||||
- // 1. Repeat for non-url items, if any:
|
||||
- for (auto *pbItem : nonUrls) {
|
||||
- auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:pbItem] autorelease];
|
||||
- const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
|
||||
- dragImage.size.width,
|
||||
- dragImage.size.height);
|
||||
- [newItem setDraggingFrame:itemFrame contents:dragImage];
|
||||
- [dragItems addObject:newItem];
|
||||
- }
|
||||
-
|
||||
- [sourceView beginDraggingSessionWithItems:dragItems event:m_lastEvent source:sourceView];
|
||||
- internalDragLoop.exec();
|
||||
- return true;
|
||||
-}
|
||||
-
|
||||
void QCocoaDrag::setAcceptedAction(Qt::DropAction act)
|
||||
{
|
||||
m_executed_drop_action = act;
|
||||
}
|
||||
|
||||
-void QCocoaDrag::exitDragLoop()
|
||||
-{
|
||||
- if (internalDragLoop.isRunning())
|
||||
- internalDragLoop.exit();
|
||||
-}
|
||||
-
|
||||
-
|
||||
QPixmap QCocoaDrag::dragPixmap(QDrag *drag, QPoint &hotSpot) const
|
||||
{
|
||||
const QMimeData* data = drag->mimeData();
|
||||
diff --git a/src/plugins/platforms/cocoa/qnsview_dragging.mm b/src/plugins/platforms/cocoa/qnsview_dragging.mm
|
||||
index 978d73f7d9..463e3c5579 100644
|
||||
--- a/src/plugins/platforms/cocoa/qnsview_dragging.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qnsview_dragging.mm
|
||||
@@ -232,10 +232,6 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
|
||||
if (!target)
|
||||
return;
|
||||
|
||||
- auto *nativeDrag = QCocoaIntegration::instance()->drag();
|
||||
- Q_ASSERT(nativeDrag);
|
||||
- nativeDrag->exitDragLoop();
|
||||
-
|
||||
QPoint windowPoint = QPointF::fromCGPoint([self convertPoint:sender.draggingLocation fromView:nil]).toPoint();
|
||||
|
||||
qCDebug(lcQpaMouse) << QEvent::DragLeave << self << "at" << windowPoint;
|
||||
@@ -294,10 +290,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
|
||||
if (!target)
|
||||
return;
|
||||
|
||||
- QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag();
|
||||
- Q_ASSERT(nativeDrag);
|
||||
- nativeDrag->exitDragLoop();
|
||||
- nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation));
|
||||
+ QCocoaIntegration::instance()->drag();
|
||||
|
||||
// Qt starts drag-and-drop on a mouse button press event. Cococa in
|
||||
// this case won't send the matching release event, so we have to
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
From e55ca5d08b29e67b699dc217abcb65e4a7655f72 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
|
||||
Date: Mon, 7 Dec 2020 12:32:37 -0500
|
||||
Subject: [PATCH 5/6] Revert "macOS: Fix use of deprecated NSOffState"
|
||||
|
||||
This reverts commit 6a0995525d306a1fa224adcbcb9f0ae1fc7d01bd.
|
||||
---
|
||||
src/plugins/styles/mac/qmacstyle_mac.mm | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
|
||||
index d1febd81d4..b5e6e60ec0 100644
|
||||
--- a/src/plugins/styles/mac/qmacstyle_mac.mm
|
||||
+++ b/src/plugins/styles/mac/qmacstyle_mac.mm
|
||||
@@ -3955,7 +3955,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
|
||||
pbCell = static_cast<NSPopUpButtonCell *>(pb.cell);
|
||||
oldPosition = pbCell.arrowPosition;
|
||||
pbCell.arrowPosition = NSPopUpNoArrow;
|
||||
- if (pb.state == NSControlStateValueOff) {
|
||||
+ if (pb.state == NSOffState) {
|
||||
// NSPopUpButton in this state is smaller.
|
||||
rAdjusted.origin.x -= 3;
|
||||
rAdjusted.size.width += 6;
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
From 3ce5e752c66307f905fdf732b102a396d9248fbb Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
|
||||
Date: Mon, 7 Dec 2020 13:22:02 -0500
|
||||
Subject: [PATCH 6/6] git checkout v5.15.0 --
|
||||
src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
|
||||
|
||||
---
|
||||
.../cocoa/qcocoacolordialoghelper.mm | 50 +++++++++----------
|
||||
1 file changed, 25 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
|
||||
index 5ad1f9d7bb..c9fa035d87 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
|
||||
@@ -180,34 +180,34 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate);
|
||||
|
||||
- (void)updateQtColor
|
||||
{
|
||||
- // Discard the color space and pass the color components to QColor. This
|
||||
- // is a good option as long as QColor is color-unmanaged: we preserve the
|
||||
- // exact RGB value from the color picker, which is predictable. Further,
|
||||
- // painting with the color will reproduce the same color on-screen, as
|
||||
- // long as the the same screen is used for selecting the color.
|
||||
- NSColor *componentColor = [[mColorPanel color] colorUsingType:NSColorTypeComponentBased];
|
||||
- switch (componentColor.colorSpace.colorSpaceModel)
|
||||
- {
|
||||
- case NSColorSpaceModelGray: {
|
||||
- CGFloat white = 0, alpha = 0;
|
||||
- [componentColor getWhite:&white alpha:&alpha];
|
||||
- mQtColor.setRgbF(white, white, white, alpha);
|
||||
- } break;
|
||||
- case NSColorSpaceModelRGB: {
|
||||
- CGFloat red = 0, green = 0, blue = 0, alpha = 0;
|
||||
- [componentColor getRed:&red green:&green blue:&blue alpha:&alpha];
|
||||
- mQtColor.setRgbF(red, green, blue, alpha);
|
||||
- } break;
|
||||
- case NSColorSpaceModelCMYK: {
|
||||
+ NSColor *color = [mColorPanel color];
|
||||
+ NSString *colorSpaceName = [color colorSpaceName];
|
||||
+ if (colorSpaceName == NSDeviceCMYKColorSpace) {
|
||||
CGFloat cyan = 0, magenta = 0, yellow = 0, black = 0, alpha = 0;
|
||||
- [componentColor getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha];
|
||||
+ [color getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha];
|
||||
mQtColor.setCmykF(cyan, magenta, yellow, black, alpha);
|
||||
- } break;
|
||||
- default:
|
||||
- qWarning("QNSColorPanelDelegate: Unsupported color space model");
|
||||
- break;
|
||||
+ } else if (colorSpaceName == NSCalibratedRGBColorSpace || colorSpaceName == NSDeviceRGBColorSpace) {
|
||||
+ CGFloat red = 0, green = 0, blue = 0, alpha = 0;
|
||||
+ [color getRed:&red green:&green blue:&blue alpha:&alpha];
|
||||
+ mQtColor.setRgbF(red, green, blue, alpha);
|
||||
+ } else if (colorSpaceName == NSNamedColorSpace) {
|
||||
+ NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
|
||||
+ CGFloat red = 0, green = 0, blue = 0, alpha = 0;
|
||||
+ [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha];
|
||||
+ mQtColor.setRgbF(red, green, blue, alpha);
|
||||
+ } else {
|
||||
+ NSColorSpace *colorSpace = [color colorSpace];
|
||||
+ if ([colorSpace colorSpaceModel] == NSCMYKColorSpaceModel && [color numberOfComponents] == 5){
|
||||
+ CGFloat components[5];
|
||||
+ [color getComponents:components];
|
||||
+ mQtColor.setCmykF(components[0], components[1], components[2], components[3], components[4]);
|
||||
+ } else {
|
||||
+ NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
|
||||
+ CGFloat red = 0, green = 0, blue = 0, alpha = 0;
|
||||
+ [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha];
|
||||
+ mQtColor.setRgbF(red, green, blue, alpha);
|
||||
+ }
|
||||
}
|
||||
-
|
||||
if (mHelper)
|
||||
emit mHelper->currentColorChanged(mQtColor);
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -4,339 +4,339 @@
|
||||
|
||||
{
|
||||
qt3d = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qt3d-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "61856f0c453b79e98b7a1e65ea8f59976fa78230ffa8dec959b5f4b45383dffd";
|
||||
name = "qt3d-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d";
|
||||
name = "qt3d-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtactiveqt = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtactiveqt-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "1b455eacfb9ef49912d7a79040ea409a6ab88dfa192d313e6b5e02a79d741b51";
|
||||
name = "qtactiveqt-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtactiveqt-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c";
|
||||
name = "qtactiveqt-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtandroidextras = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtandroidextras-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "c9019185221e94e37e250c84acaebfb7b2f5342e8ad60cdcff052ac2b85ec671";
|
||||
name = "qtandroidextras-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtandroidextras-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "5813278690d89a9c232eccf697fc280034de6f9f02a7c40d95ad5fcf8ac8dabd";
|
||||
name = "qtandroidextras-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtbase = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5";
|
||||
name = "qtbase-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8";
|
||||
name = "qtbase-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtcharts = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtcharts-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "44a24fc16abcaf9ae97ecf3215f6f3b44ebdb3b73bcb4ed3549a51519e4883a7";
|
||||
name = "qtcharts-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11";
|
||||
name = "qtcharts-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtconnectivity = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtconnectivity-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "f911fb8f8bf3a9958785d0378d25ced8989047938b7138d619854a94fa0b27dd";
|
||||
name = "qtconnectivity-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0";
|
||||
name = "qtconnectivity-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdatavis3d = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdatavis3d-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "8f07747f371f7c515c667240a795105c89aa83c08d88ee92fa1ef7efccea10a3";
|
||||
name = "qtdatavis3d-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdatavis3d-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd";
|
||||
name = "qtdatavis3d-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdeclarative = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdeclarative-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699";
|
||||
name = "qtdeclarative-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651";
|
||||
name = "qtdeclarative-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdoc = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdoc-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "07ca8db98c317f25cc9a041c48a6824baf63893bf5b535d6f8d266dea8c7659f";
|
||||
name = "qtdoc-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdoc-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "a47809f00f1bd690ca4e699cb32ffe7717d43da84e0167d1f562210da7714ce4";
|
||||
name = "qtdoc-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtgamepad = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtgamepad-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "dda54d9f90897944bed5e6af48a904a677fd97eb6f57ab08a2b232c431caf31a";
|
||||
name = "qtgamepad-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtgamepad-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c";
|
||||
name = "qtgamepad-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtgraphicaleffects = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "0d2ea4bc73b9df13a4b739dcbc1e3c7b298c7e682f7f9252b232e3bde7b63eda";
|
||||
name = "qtgraphicaleffects-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4";
|
||||
name = "qtgraphicaleffects-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtimageformats = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtimageformats-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "83f32101b1a898fcb8ed6f11a657d1125484ac0c2223014b61849d9010efebc8";
|
||||
name = "qtimageformats-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7";
|
||||
name = "qtimageformats-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlocation = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtlocation-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f";
|
||||
name = "qtlocation-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0";
|
||||
name = "qtlocation-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlottie = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtlottie-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "2053f474dcd7184fdcae2507f47af6527f6ca25b4424483f9265853c3626c833";
|
||||
name = "qtlottie-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517";
|
||||
name = "qtlottie-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtmacextras = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtmacextras-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "95a8c35b30373224cdd6d1ca0bdda1a314b20e91551a4824e8ca7e50ce8ff439";
|
||||
name = "qtmacextras-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtmacextras-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "6959b0f2cec71cd66800f36cab797430860e55fa33c9c23698d6a08fc2b8776e";
|
||||
name = "qtmacextras-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtmultimedia = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtmultimedia-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7";
|
||||
name = "qtmultimedia-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5";
|
||||
name = "qtmultimedia-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtnetworkauth = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtnetworkauth-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "96c6107f6e85662a05f114c5b9bd3503a3100bd940e1494c73a99e77f9e7cf85";
|
||||
name = "qtnetworkauth-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtnetworkauth-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85";
|
||||
name = "qtnetworkauth-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtpurchasing = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtpurchasing-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "2127f180c4889055d88e2b402b62be80a5a213a0e48d2056cc9a01d9913b3a16";
|
||||
name = "qtpurchasing-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtpurchasing-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "87120d319ff2f8106e78971f7296d72a66dfe91e763d213199aea55046e93227";
|
||||
name = "qtpurchasing-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquick3d = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquick3d-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "6d3b91b653ba5e33fd5b37cd785ded6cf1dd83d35250c3addb77eb35f90e52cb";
|
||||
name = "qtquick3d-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquick3d-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "5b0546323365ce34e4716f22f305ebb4902e222c1a0910b65ee448443c2f94bb";
|
||||
name = "qtquick3d-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquickcontrols = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee";
|
||||
name = "qtquickcontrols-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5";
|
||||
name = "qtquickcontrols-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquickcontrols2 = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols2-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f";
|
||||
name = "qtquickcontrols2-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919";
|
||||
name = "qtquickcontrols2-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquicktimeline = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquicktimeline-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "16ffeb733ba15815121fca5705ed5220ce0a0eb2ec0431ad0d55da9426a03c00";
|
||||
name = "qtquicktimeline-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28";
|
||||
name = "qtquicktimeline-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtremoteobjects = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtremoteobjects-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "86fcfdce77f13c7babdec4dc1d0c4b7b6b02e40120a4250dc59e911c53c08abf";
|
||||
name = "qtremoteobjects-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2";
|
||||
name = "qtremoteobjects-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtscript = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtscript-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "02dc21b309621876a89671be27cea86a58e74a96aa28da65fe1b37a3aad29373";
|
||||
name = "qtscript-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e";
|
||||
name = "qtscript-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtscxml = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtscxml-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "9c3a72bf5ebd07553b0049cc1943f04cff93b7e53bde8c81d652422dbf12ff72";
|
||||
name = "qtscxml-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc";
|
||||
name = "qtscxml-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsensors = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtsensors-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "12b17ed6cbe6c49c8ab71958bc5d8ad1c42bf20e2fa72613ede11001e98144da";
|
||||
name = "qtsensors-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839";
|
||||
name = "qtsensors-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialbus = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtserialbus-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "cee067c84d025e221b83d109b58ea16c4d2dc0af0aea45cc6724acd33a1b7379";
|
||||
name = "qtserialbus-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88";
|
||||
name = "qtserialbus-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialport = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtserialport-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "ba19369069a707dffddca8d9c477bb2bb4aa26630dfee6792254c4bf9bd57a67";
|
||||
name = "qtserialport-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d";
|
||||
name = "qtserialport-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtspeech = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtspeech-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "7219a878c14a24d0ca18d52df1717361b13aee96ac9790baf9ad2b383492dd61";
|
||||
name = "qtspeech-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtspeech-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5";
|
||||
name = "qtspeech-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsvg = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtsvg-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d";
|
||||
name = "qtsvg-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e";
|
||||
name = "qtsvg-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qttools = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437";
|
||||
name = "qttools-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc";
|
||||
name = "qttools-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qttranslations = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qttranslations-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "45c43268d9df50784d4d8ca345fce9288a1055fd074ac0ef508097f7aeba22fe";
|
||||
name = "qttranslations-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qttranslations-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8";
|
||||
name = "qttranslations-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtvirtualkeyboard = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "f22f9204ab65578d9c8aa832a8a39108f826e00a7d391c7884ff490c587f34be";
|
||||
name = "qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55";
|
||||
name = "qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwayland = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwayland-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb";
|
||||
name = "qtwayland-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5";
|
||||
name = "qtwayland-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebchannel = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebchannel-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "ea80510b363e6f92ce99932f06d176e43459c4a5159fe97b5ef96fcfbab5ed4f";
|
||||
name = "qtwebchannel-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1";
|
||||
name = "qtwebchannel-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebengine = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebengine-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df";
|
||||
name = "qtwebengine-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0";
|
||||
name = "qtwebengine-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebglplugin = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebglplugin-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "f7b81f25ddf7b3a0046daa7224bc1e18c8b754b00b1a33775f30f827a5cdca15";
|
||||
name = "qtwebglplugin-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebglplugin-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446";
|
||||
name = "qtwebglplugin-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebsockets = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebsockets-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "87c2f6542778f9b65b3f208740c1d0db643fd0bede21404b9abb265355da5092";
|
||||
name = "qtwebsockets-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f";
|
||||
name = "qtwebsockets-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebview = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebview-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660";
|
||||
name = "qtwebview-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7";
|
||||
name = "qtwebview-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwinextras = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwinextras-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "d77f2cb2ce83bdbfd0a970bc8d7d11c96b2df16befc257d6594f79dfd92abff0";
|
||||
name = "qtwinextras-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwinextras-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e";
|
||||
name = "qtwinextras-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtx11extras = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtx11extras-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1";
|
||||
name = "qtx11extras-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e";
|
||||
name = "qtx11extras-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtxmlpatterns = {
|
||||
version = "5.15.0";
|
||||
version = "5.15.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtxmlpatterns-everywhere-src-5.15.0.tar.xz";
|
||||
sha256 = "2752cf2aa25ebfda89c3736457e27b3d0c7c7ed290dcfd52c209f9f905998507";
|
||||
name = "qtxmlpatterns-everywhere-src-5.15.0.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz";
|
||||
sha256 = "76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa";
|
||||
name = "qtxmlpatterns-everywhere-src-5.15.2.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -30,12 +30,12 @@ let
|
||||
|
||||
in buildPythonPackage rec {
|
||||
pname = "PyQt5";
|
||||
version = "5.15.1";
|
||||
version = "5.15.2";
|
||||
format = "other";
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "18grs2p698ihjgi8agksv6sajakciywyr29ihslqvl260a2np9yr";
|
||||
sha256 = "1z74295i69cha52llsqffzhb5zz7qnbjc64h8qg21l91jgf0harp";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
Reference in New Issue
Block a user