gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zeal: fix build with qt 6.10

Browse Source
This commit is contained in:
winston
2025-10-24 22:12:47 +02:00
parent 81a37420ab
commit efb1e653eb
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/ze/zeal/package.nix
+2
View File
@@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-9tlo7+namWNWrWVQNqaOvtK4NQIdb0p8qvFrrbUamOo=";
};
patches = [ ./qt6_10.patch ];
nativeBuildInputs = [
cmake
extra-cmake-modules
pkgs/by-name/ze/zeal/qt6_10.patch
+34
View File
@@ -0,0 +1,34 @@
diff --git a/src/libs/ui/docsetsdialog.cpp b/src/libs/ui/docsetsdialog.cpp
index 8c9fe63..5c73480 100644
--- a/src/libs/ui/docsetsdialog.cpp
+++ b/src/libs/ui/docsetsdialog.cpp
@@ -360,7 +360,7 @@ void DocsetsDialog::downloadCompleted()
QTemporaryFile *tmpFile = m_tmpFiles[docsetName];
if (!tmpFile) {
tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this);
- tmpFile->open();
+ (void)tmpFile->open();
m_tmpFiles.insert(docsetName, tmpFile);
}
@@ -403,7 +403,7 @@ void DocsetsDialog::downloadProgress(qint64 received, qint64 total)
QTemporaryFile *tmpFile = m_tmpFiles[docsetName];
if (!tmpFile) {
tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this);
- tmpFile->open();
+ (void)tmpFile->open();
m_tmpFiles.insert(docsetName, tmpFile);
}
diff --git a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
index 476c2f5..f49da88 100644
--- a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
+++ b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
@@ -42,6 +42,7 @@ elseif(UNIX AND X11_FOUND)
find_package(Qt5 COMPONENTS X11Extras REQUIRED)
target_link_libraries(QxtGlobalShortcut Qt5::X11Extras)
else()
+ find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
target_link_libraries(QxtGlobalShortcut Qt${QT_VERSION_MAJOR}::GuiPrivate)
endif()