mirror of
https://github.com/monero-project/monero.git
synced 2024-11-17 00:07:38 +00:00
depends: remove unused Qt package
This commit is contained in:
selsta
parent
7cbae6ca98
commit
09402d0edb
10 changed files with 3 additions and 311 deletions
4
.github/workflows/depends.yml
vendored
4
.github/workflows/depends.yml
vendored
|
|
@ -36,13 +36,13 @@ jobs:
|
||||||
packages: "python3 gperf g++-aarch64-linux-gnu"
|
packages: "python3 gperf g++-aarch64-linux-gnu"
|
||||||
- name: "i686 Win"
|
- name: "i686 Win"
|
||||||
host: "i686-w64-mingw32"
|
host: "i686-w64-mingw32"
|
||||||
packages: "python3 g++-mingw-w64-i686 qttools5-dev-tools"
|
packages: "python3 g++-mingw-w64-i686"
|
||||||
- name: "i686 Linux"
|
- name: "i686 Linux"
|
||||||
host: "i686-pc-linux-gnu"
|
host: "i686-pc-linux-gnu"
|
||||||
packages: "gperf cmake g++-multilib python3-zmq"
|
packages: "gperf cmake g++-multilib python3-zmq"
|
||||||
- name: "Win64"
|
- name: "Win64"
|
||||||
host: "x86_64-w64-mingw32"
|
host: "x86_64-w64-mingw32"
|
||||||
packages: "cmake python3 g++-mingw-w64-x86-64 qttools5-dev-tools"
|
packages: "cmake python3 g++-mingw-w64-x86-64"
|
||||||
- name: "x86_64 Linux"
|
- name: "x86_64 Linux"
|
||||||
host: "x86_64-unknown-linux-gnu"
|
host: "x86_64-unknown-linux-gnu"
|
||||||
packages: "gperf cmake python3-zmq libdbus-1-dev libharfbuzz-dev"
|
packages: "gperf cmake python3-zmq libdbus-1-dev libharfbuzz-dev"
|
||||||
|
|
|
||||||
|
|
@ -110,8 +110,7 @@ $(host_arch)_$(host_os)_id_string+=$(shell $(host_CXX) --version 2>/dev/null)
|
||||||
$(host_arch)_$(host_os)_id_string+=$(shell $(host_RANLIB) --version 2>/dev/null)
|
$(host_arch)_$(host_os)_id_string+=$(shell $(host_RANLIB) --version 2>/dev/null)
|
||||||
$(host_arch)_$(host_os)_id_string+=$(shell $(host_STRIP) --version 2>/dev/null)
|
$(host_arch)_$(host_os)_id_string+=$(shell $(host_STRIP) --version 2>/dev/null)
|
||||||
|
|
||||||
qt_packages_$(NO_QT) = $(qt_packages)
|
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages)
|
||||||
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(qt_packages_)
|
|
||||||
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
|
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
|
||||||
|
|
||||||
all_packages = $(packages) $(native_packages)
|
all_packages = $(packages) $(native_packages)
|
||||||
|
|
|
||||||
|
|
@ -7,27 +7,12 @@ ac_tool_prefix=${host_alias}-
|
||||||
if test -z $with_boost; then
|
if test -z $with_boost; then
|
||||||
with_boost=$depends_prefix
|
with_boost=$depends_prefix
|
||||||
fi
|
fi
|
||||||
if test -z $with_qt_plugindir; then
|
|
||||||
with_qt_plugindir=$depends_prefix/plugins
|
|
||||||
fi
|
|
||||||
if test -z $with_qt_translationdir; then
|
|
||||||
with_qt_translationdir=$depends_prefix/translations
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x@host_os@ = xdarwin; then
|
if test x@host_os@ = xdarwin; then
|
||||||
BREW=no
|
BREW=no
|
||||||
PORT=no
|
PORT=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x@host_os@ = xmingw32; then
|
|
||||||
if test -z $with_qt_incdir; then
|
|
||||||
with_qt_incdir=$depends_prefix/include
|
|
||||||
fi
|
|
||||||
if test -z $with_qt_libdir; then
|
|
||||||
with_qt_libdir=$depends_prefix/lib
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
PATH=$depends_prefix/native/bin:$PATH
|
PATH=$depends_prefix/native/bin:$PATH
|
||||||
PKG_CONFIG="`which pkg-config` --static"
|
PKG_CONFIG="`which pkg-config` --static"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ freebsd_packages = ncurses readline sodium
|
||||||
|
|
||||||
linux_packages = eudev ncurses readline sodium $(hardware_packages)
|
linux_packages = eudev ncurses readline sodium $(hardware_packages)
|
||||||
linux_native_packages = $(hardware_native_packages)
|
linux_native_packages = $(hardware_native_packages)
|
||||||
qt_packages = qt
|
|
||||||
|
|
||||||
ifeq ($(build_tests),ON)
|
ifeq ($(build_tests),ON)
|
||||||
packages += gtest
|
packages += gtest
|
||||||
|
|
|
||||||
|
|
@ -1,175 +0,0 @@
|
||||||
PACKAGE=qt
|
|
||||||
$(package)_version=5.15.1
|
|
||||||
$(package)_download_path=https://download.qt.io/official_releases/qt/5.15/$($(package)_version)/submodules
|
|
||||||
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
|
|
||||||
$(package)_file_name=qtbase-$($(package)_suffix)
|
|
||||||
$(package)_sha256_hash=33960404d579675b7210de103ed06a72613bfc4305443e278e2d32a3eb1f3d8c
|
|
||||||
$(package)_build_subdir=qtbase
|
|
||||||
$(package)_qt_libs=corelib
|
|
||||||
$(package)_patches=fix_qt_pkgconfig.patch fix_no_printer.patch fix_rcc_determinism.patch no-xlib.patch
|
|
||||||
|
|
||||||
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
|
|
||||||
$(package)_qttranslations_sha256_hash=46e0c0e3a511fbcc803a4146204062e47f6ed43b34d98a3c27372a03b8746bd8
|
|
||||||
|
|
||||||
$(package)_qttools_file_name=qttools-$($(package)_suffix)
|
|
||||||
$(package)_qttools_sha256_hash=c98ee5f0f980bf68cbf0c94d62434816a92441733de50bd9adbe9b9055f03498
|
|
||||||
|
|
||||||
$(package)_extra_sources = $($(package)_qttranslations_file_name)
|
|
||||||
$(package)_extra_sources += $($(package)_qttools_file_name)
|
|
||||||
|
|
||||||
define $(package)_set_vars
|
|
||||||
$(package)_config_opts_release = -release
|
|
||||||
$(package)_config_opts_debug = -debug
|
|
||||||
$(package)_config_opts += -bindir $(build_prefix)/bin
|
|
||||||
$(package)_config_opts += -c++std c++11
|
|
||||||
$(package)_config_opts += -confirm-license
|
|
||||||
$(package)_config_opts += -dbus-runtime
|
|
||||||
$(package)_config_opts += -hostprefix $(build_prefix)
|
|
||||||
$(package)_config_opts += -no-compile-examples
|
|
||||||
$(package)_config_opts += -no-cups
|
|
||||||
$(package)_config_opts += -no-egl
|
|
||||||
$(package)_config_opts += -no-eglfs
|
|
||||||
$(package)_config_opts += -no-evdev
|
|
||||||
$(package)_config_opts += -no-gui
|
|
||||||
$(package)_config_opts += -no-freetype
|
|
||||||
$(package)_config_opts += -no-gif
|
|
||||||
$(package)_config_opts += -no-glib
|
|
||||||
$(package)_config_opts += -no-icu
|
|
||||||
$(package)_config_opts += -no-ico
|
|
||||||
$(package)_config_opts += -no-iconv
|
|
||||||
$(package)_config_opts += -no-kms
|
|
||||||
$(package)_config_opts += -no-linuxfb
|
|
||||||
$(package)_config_opts += -no-libjpeg
|
|
||||||
$(package)_config_opts += -no-libudev
|
|
||||||
$(package)_config_opts += -no-mtdev
|
|
||||||
$(package)_config_opts += -no-openvg
|
|
||||||
$(package)_config_opts += -no-reduce-relocations
|
|
||||||
$(package)_config_opts += -no-sql-db2
|
|
||||||
$(package)_config_opts += -no-sql-ibase
|
|
||||||
$(package)_config_opts += -no-sql-oci
|
|
||||||
$(package)_config_opts += -no-sql-tds
|
|
||||||
$(package)_config_opts += -no-sql-mysql
|
|
||||||
$(package)_config_opts += -no-sql-odbc
|
|
||||||
$(package)_config_opts += -no-sql-psql
|
|
||||||
$(package)_config_opts += -no-sql-sqlite
|
|
||||||
$(package)_config_opts += -no-sql-sqlite2
|
|
||||||
$(package)_config_opts += -no-use-gold-linker
|
|
||||||
$(package)_config_opts += -nomake examples
|
|
||||||
$(package)_config_opts += -nomake tests
|
|
||||||
$(package)_config_opts += -opensource
|
|
||||||
$(package)_config_opts += -no-openssl
|
|
||||||
$(package)_config_opts += -optimized-qmake
|
|
||||||
$(package)_config_opts += -pch
|
|
||||||
$(package)_config_opts += -pkg-config
|
|
||||||
$(package)_config_opts += -prefix $(host_prefix)
|
|
||||||
$(package)_config_opts += -no-libpng
|
|
||||||
$(package)_config_opts += -qt-pcre
|
|
||||||
$(package)_config_opts += -qt-harfbuzz
|
|
||||||
$(package)_config_opts += -no-zlib
|
|
||||||
$(package)_config_opts += -static
|
|
||||||
$(package)_config_opts += -silent
|
|
||||||
$(package)_config_opts += -v
|
|
||||||
$(package)_config_opts += -no-feature-bearermanagement
|
|
||||||
$(package)_config_opts += -no-feature-colordialog
|
|
||||||
$(package)_config_opts += -no-feature-dial
|
|
||||||
$(package)_config_opts += -no-feature-filesystemwatcher
|
|
||||||
$(package)_config_opts += -no-feature-fontcombobox
|
|
||||||
$(package)_config_opts += -no-feature-ftp
|
|
||||||
$(package)_config_opts += -no-feature-image_heuristic_mask
|
|
||||||
$(package)_config_opts += -no-feature-keysequenceedit
|
|
||||||
$(package)_config_opts += -no-feature-lcdnumber
|
|
||||||
$(package)_config_opts += -no-feature-pdf
|
|
||||||
$(package)_config_opts += -no-feature-printdialog
|
|
||||||
$(package)_config_opts += -no-feature-printer
|
|
||||||
$(package)_config_opts += -no-feature-printpreviewdialog
|
|
||||||
$(package)_config_opts += -no-feature-printpreviewwidget
|
|
||||||
$(package)_config_opts += -no-feature-sessionmanager
|
|
||||||
$(package)_config_opts += -no-feature-sql
|
|
||||||
$(package)_config_opts += -no-feature-statemachine
|
|
||||||
$(package)_config_opts += -no-feature-syntaxhighlighter
|
|
||||||
$(package)_config_opts += -no-feature-textbrowser
|
|
||||||
$(package)_config_opts += -no-feature-textodfwriter
|
|
||||||
$(package)_config_opts += -no-feature-topleveldomain
|
|
||||||
$(package)_config_opts += -no-feature-udpsocket
|
|
||||||
$(package)_config_opts += -no-feature-undocommand
|
|
||||||
$(package)_config_opts += -no-feature-undogroup
|
|
||||||
$(package)_config_opts += -no-feature-undostack
|
|
||||||
$(package)_config_opts += -no-feature-undoview
|
|
||||||
$(package)_config_opts += -no-feature-vnc
|
|
||||||
$(package)_config_opts += -no-feature-wizard
|
|
||||||
$(package)_config_opts_linux = -no-fontconfig
|
|
||||||
$(package)_config_opts_linux += -no-opengl
|
|
||||||
$(package)_config_opts_linux += -no-xcb
|
|
||||||
$(package)_config_opts_linux += -no-feature-xlib
|
|
||||||
endef
|
|
||||||
|
|
||||||
define $(package)_fetch_cmds
|
|
||||||
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_download_file),$($(package)_file_name),$($(package)_sha256_hash)) && \
|
|
||||||
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qttranslations_file_name),$($(package)_qttranslations_file_name),$($(package)_qttranslations_sha256_hash)) && \
|
|
||||||
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qttools_file_name),$($(package)_qttools_file_name),$($(package)_qttools_sha256_hash))
|
|
||||||
endef
|
|
||||||
|
|
||||||
define $(package)_extract_cmds
|
|
||||||
mkdir -p $($(package)_extract_dir) && \
|
|
||||||
echo "$($(package)_sha256_hash) $($(package)_source)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \
|
|
||||||
echo "$($(package)_qttranslations_sha256_hash) $($(package)_source_dir)/$($(package)_qttranslations_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
|
|
||||||
echo "$($(package)_qttools_sha256_hash) $($(package)_source_dir)/$($(package)_qttools_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
|
|
||||||
$(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \
|
|
||||||
mkdir qtbase && \
|
|
||||||
tar --strip-components=1 -xf $($(package)_source) -C qtbase && \
|
|
||||||
mkdir qttranslations && \
|
|
||||||
tar --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttranslations_file_name) -C qttranslations && \
|
|
||||||
mkdir qttools && \
|
|
||||||
tar --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttools_file_name) -C qttools
|
|
||||||
endef
|
|
||||||
|
|
||||||
|
|
||||||
define $(package)_preprocess_cmds
|
|
||||||
sed -i.old "s|FT_Get_Font_Format|FT_Get_X11_Font_Format|" qtbase/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp && \
|
|
||||||
sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
|
|
||||||
sed -i.old "/updateqm.depends =/d" qttranslations/translations/translations.pro && \
|
|
||||||
sed -i.old "s/src_plugins.depends = src_sql src_network/src_plugins.depends = src_network/" qtbase/src/src.pro && \
|
|
||||||
cp -r qtbase/mkspecs/linux-arm-gnueabi-g++ qtbase/mkspecs/bitcoin-linux-g++ && \
|
|
||||||
sed -i.old "s/arm-linux-gnueabi-/$(host)-/g" qtbase/mkspecs/bitcoin-linux-g++/qmake.conf && \
|
|
||||||
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
|
|
||||||
patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch && \
|
|
||||||
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
|
|
||||||
echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
|
|
||||||
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
|
|
||||||
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
|
|
||||||
echo "QMAKE_LINK_OBJECT_MAX = 10" >> qtbase/mkspecs/win32-g++/qmake.conf && \
|
|
||||||
echo "QMAKE_LINK_OBJECT_SCRIPT = object_script" >> qtbase/mkspecs/win32-g++/qmake.conf && \
|
|
||||||
sed -i.old "s|QMAKE_CFLAGS += |!host_build: QMAKE_CFLAGS = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
|
|
||||||
sed -i.old "s|QMAKE_CXXFLAGS += |!host_build: QMAKE_CXXFLAGS = $($(package)_cxxflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
|
|
||||||
sed -i.old "0,/^QMAKE_LFLAGS_/s|^QMAKE_LFLAGS_|!host_build: QMAKE_LFLAGS = $($(package)_ldflags)\n&|" qtbase/mkspecs/win32-g++/qmake.conf && \
|
|
||||||
sed -i.old "s/LIBRARY_PATH/(CROSS_)?\0/g" qtbase/mkspecs/features/toolchain.prf
|
|
||||||
endef
|
|
||||||
|
|
||||||
define $(package)_config_cmds
|
|
||||||
export PKG_CONFIG_SYSROOT_DIR=/ && \
|
|
||||||
export PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig && \
|
|
||||||
export PKG_CONFIG_PATH=$(host_prefix)/share/pkgconfig && \
|
|
||||||
./configure $($(package)_config_opts) && \
|
|
||||||
echo "CONFIG += force_bootstrap" >> mkspecs/qconfig.pri && \
|
|
||||||
$(MAKE) sub-src-clean && \
|
|
||||||
cd ../qttranslations && ../qtbase/bin/qmake qttranslations.pro -o Makefile && \
|
|
||||||
cd translations && ../../qtbase/bin/qmake translations.pro -o Makefile && cd ../.. &&\
|
|
||||||
cd qttools/src/linguist/lrelease/ && ../../../../qtbase/bin/qmake lrelease.pro -o Makefile
|
|
||||||
endef
|
|
||||||
|
|
||||||
define $(package)_build_cmds
|
|
||||||
$(MAKE) -C src $(addprefix sub-,$($(package)_qt_libs)) && \
|
|
||||||
$(MAKE) -C ../qttools/src/linguist/lrelease && \
|
|
||||||
$(MAKE) -C ../qttranslations
|
|
||||||
endef
|
|
||||||
|
|
||||||
define $(package)_stage_cmds
|
|
||||||
$(MAKE) -C src INSTALL_ROOT=$($(package)_staging_dir) $(addsuffix -install_subtargets,$(addprefix sub-,$($(package)_qt_libs))) && cd .. &&\
|
|
||||||
$(MAKE) -C qttools/src/linguist/lrelease INSTALL_ROOT=$($(package)_staging_dir) install_target && \
|
|
||||||
$(MAKE) -C qttranslations INSTALL_ROOT=$($(package)_staging_dir) install_subtargets
|
|
||||||
endef
|
|
||||||
|
|
||||||
define $(package)_postprocess_cmds
|
|
||||||
rm -rf native/mkspecs/ native/lib/ lib/cmake/ && \
|
|
||||||
rm -f lib/lib*.la lib/*.prl plugins/*/*.prl
|
|
||||||
endef
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
--- x/qtbase/src/plugins/platforms/cocoa/qprintengine_mac_p.h
|
|
||||||
+++ y/qtbase/src/plugins/platforms/cocoa/qprintengine_mac_p.h
|
|
||||||
@@ -52,6 +52,7 @@
|
|
||||||
//
|
|
||||||
|
|
||||||
#include <QtCore/qglobal.h>
|
|
||||||
+#include <qpa/qplatformprintdevice.h>
|
|
||||||
|
|
||||||
#ifndef QT_NO_PRINTER
|
|
||||||
|
|
||||||
--- x/qtbase/src/plugins/plugins.pro
|
|
||||||
+++ y/qtbase/src/plugins/plugins.pro
|
|
||||||
@@ -9,6 +9,3 @@ qtHaveModule(gui) {
|
|
||||||
!android:qtConfig(library): SUBDIRS *= generic
|
|
||||||
}
|
|
||||||
qtHaveModule(widgets): SUBDIRS += styles
|
|
||||||
-
|
|
||||||
-!winrt:qtHaveModule(printsupport): \
|
|
||||||
- SUBDIRS += printsupport
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
--- old/qtbase/mkspecs/features/qt_module.prf
|
|
||||||
+++ new/qtbase/mkspecs/features/qt_module.prf
|
|
||||||
@@ -269,7 +269,7 @@ load(qt_installs)
|
|
||||||
load(qt_targets)
|
|
||||||
|
|
||||||
# this builds on top of qt_common
|
|
||||||
-!internal_module:if(unix|mingw):!if(darwin:debug_and_release:CONFIG(debug, debug|release)) {
|
|
||||||
+if(unix|mingw):!if(darwin:debug_and_release:CONFIG(debug, debug|release)) {
|
|
||||||
CONFIG += create_pc
|
|
||||||
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
|
|
||||||
host_build: \
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
--- old/qtbase/src/tools/rcc/rcc.cpp
|
|
||||||
+++ new/qtbase/src/tools/rcc/rcc.cpp
|
|
||||||
@@ -207,7 +207,11 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib)
|
|
||||||
if (lib.formatVersion() >= 2) {
|
|
||||||
// last modified time stamp
|
|
||||||
const QDateTime lastModified = m_fileInfo.lastModified();
|
|
||||||
- lib.writeNumber8(quint64(lastModified.isValid() ? lastModified.toMSecsSinceEpoch() : 0));
|
|
||||||
+ quint64 lastmod = quint64(lastModified.isValid() ? lastModified.toMSecsSinceEpoch() : 0);
|
|
||||||
+ static const quint64 sourceDate = 1000 * qgetenv("QT_RCC_SOURCE_DATE_OVERRIDE").toULongLong();
|
|
||||||
+ if (sourceDate != 0)
|
|
||||||
+ lastmod = sourceDate;
|
|
||||||
+ lib.writeNumber8(lastmod);
|
|
||||||
if (text || pass1)
|
|
||||||
lib.writeChar('\n');
|
|
||||||
}
|
|
||||||
|
|
@ -1,69 +0,0 @@
|
||||||
From 9563cef873ae82e06f60708d706d054717e801ce Mon Sep 17 00:00:00 2001
|
|
||||||
From: Carl Dong <contact@carldong.me>
|
|
||||||
Date: Thu, 18 Jul 2019 17:22:05 -0400
|
|
||||||
Subject: [PATCH] Wrap xlib related code blocks in #if's
|
|
||||||
|
|
||||||
They are not necessary to compile QT.
|
|
||||||
---
|
|
||||||
qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp | 8 ++++++++
|
|
||||||
1 file changed, 8 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
|
|
||||||
index 7c62c2e2b3..c05c6c0a07 100644
|
|
||||||
--- a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
|
|
||||||
+++ b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
|
|
||||||
@@ -49,7 +49,9 @@
|
|
||||||
#include <QtGui/QWindow>
|
|
||||||
#include <QtGui/QBitmap>
|
|
||||||
#include <QtGui/private/qguiapplication_p.h>
|
|
||||||
+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
|
|
||||||
#include <X11/cursorfont.h>
|
|
||||||
+#endif
|
|
||||||
#include <xcb/xfixes.h>
|
|
||||||
#include <xcb/xcb_image.h>
|
|
||||||
|
|
||||||
@@ -391,6 +393,7 @@ void QXcbCursor::changeCursor(QCursor *cursor, QWindow *window)
|
|
||||||
xcb_flush(xcb_connection());
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
|
|
||||||
static int cursorIdForShape(int cshape)
|
|
||||||
{
|
|
||||||
int cursorId = 0;
|
|
||||||
@@ -444,6 +447,7 @@ static int cursorIdForShape(int cshape)
|
|
||||||
}
|
|
||||||
return cursorId;
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
xcb_cursor_t QXcbCursor::createNonStandardCursor(int cshape)
|
|
||||||
{
|
|
||||||
@@ -556,7 +560,9 @@ static xcb_cursor_t loadCursor(void *dpy, int cshape)
|
|
||||||
xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
|
|
||||||
{
|
|
||||||
xcb_connection_t *conn = xcb_connection();
|
|
||||||
+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
|
|
||||||
int cursorId = cursorIdForShape(cshape);
|
|
||||||
+#endif
|
|
||||||
xcb_cursor_t cursor = XCB_NONE;
|
|
||||||
|
|
||||||
// Try Xcursor first
|
|
||||||
@@ -586,6 +592,7 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
|
|
||||||
// Non-standard X11 cursors are created from bitmaps
|
|
||||||
cursor = createNonStandardCursor(cshape);
|
|
||||||
|
|
||||||
+#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
|
|
||||||
// Create a glpyh cursor if everything else failed
|
|
||||||
if (!cursor && cursorId) {
|
|
||||||
cursor = xcb_generate_id(conn);
|
|
||||||
@@ -593,6 +600,7 @@ xcb_cursor_t QXcbCursor::createFontCursor(int cshape)
|
|
||||||
cursorId, cursorId + 1,
|
|
||||||
0xFFFF, 0xFFFF, 0xFFFF, 0, 0, 0);
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
if (cursor && cshape >= 0 && cshape < Qt::LastCursor && connection()->hasXFixes()) {
|
|
||||||
const char *name = cursorNames[cshape].front();
|
|
||||||
---
|
|
||||||
2.22.0
|
|
||||||
|
|
||||||
|
|
@ -27,8 +27,6 @@ SET(Terminfo_LIBRARY @prefix@/lib/libtinfo.a)
|
||||||
SET(UNBOUND_INCLUDE_DIR @prefix@/include)
|
SET(UNBOUND_INCLUDE_DIR @prefix@/include)
|
||||||
SET(UNBOUND_LIBRARIES @prefix@/lib/libunbound.a)
|
SET(UNBOUND_LIBRARIES @prefix@/lib/libunbound.a)
|
||||||
|
|
||||||
SET(LRELEASE_PATH @prefix@/native/bin CACHE FILEPATH "path to lrelease" FORCE)
|
|
||||||
|
|
||||||
if(NOT CMAKE_SYSTEM_NAME STREQUAL "Android")
|
if(NOT CMAKE_SYSTEM_NAME STREQUAL "Android")
|
||||||
SET(LIBUNWIND_INCLUDE_DIR @prefix@/include)
|
SET(LIBUNWIND_INCLUDE_DIR @prefix@/include)
|
||||||
SET(LIBUNWIND_LIBRARIES @prefix@/lib/libunwind.a)
|
SET(LIBUNWIND_LIBRARIES @prefix@/lib/libunwind.a)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue