Skip to content
Snippets Groups Projects
Commit 10f51c60 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

contrib: qtdeclarative: remove patch for static linking

It links fine in meson and autotools without it.

Introduced in 750852d1.
parent c7bac983
No related branches found
No related tags found
1 merge request!6479contrib: qtdeclarative: remove patch for static linking
Pipeline #542306 passed with stage
in 31 minutes and 38 seconds
From c68baab79783c2f103d779b9b9eb4de24781cd76 Mon Sep 17 00:00:00 2001
From: Fatih Uzunoglu <fuzun54@outlook.com>
Date: Fri, 12 Jan 2024 20:40:24 +0200
Subject: [PATCH 1/2] Fix incorrect library inclusion
QmlIntegration is a header only module. This was done to
fix building with Meson when Qt is statically linked.
---
src/qmlintegration/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qmlintegration/CMakeLists.txt b/src/qmlintegration/CMakeLists.txt
index 0dd54f53bd..e77232df84 100644
--- a/src/qmlintegration/CMakeLists.txt
+++ b/src/qmlintegration/CMakeLists.txt
@@ -5,6 +5,6 @@ qt_internal_add_module(QmlIntegration
HEADER_MODULE
SOURCES
qqmlintegration.h
- LIBRARIES
+ PRIVATE_MODULE_INTERFACE
Qt::Core
)
--
2.44.0
......@@ -34,7 +34,6 @@ $(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz:
qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
$(UNPACK)
$(APPLY) $(SRC)/qtdeclarative/0001-Fix-incorrect-library-inclusion.patch
# disable unused CLI tools: qml, qmleasing, qmldom, qmlformat, qmltc
sed -i.orig -e 's,add_subdirectory(qml),#add_subdirectory(qml),' $(UNPACK_DIR)/tools/CMakeLists.txt
sed -i.orig -e 's,add_subdirectory(qmleasing),#add_subdirectory(qmleasing),' $(UNPACK_DIR)/tools/CMakeLists.txt
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment