[DO-981] qt package (!15)
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech> Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/15
This commit is contained in:
Aleksandr Vodyanov
95
recipes/qt/6.x.x/conandata.yml
Normal file
95
recipes/qt/6.x.x/conandata.yml
Normal file
@@ -0,0 +1,95 @@
|
||||
sources:
|
||||
"6.7.3":
|
||||
url:
|
||||
- "https://download.qt.io/official_releases/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://download.qt.io/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://mirrors.ukfast.co.uk/sites/qt.io/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://mirrors.20i.com/pub/qt.io/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://ftp.nluug.nl/languages/qt/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://mirror.netcologne.de/qtproject/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://qt-mirror.dannhauer.de/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://ftp.fau.de/qtproject/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://mirrors.dotsrc.org/qtproject/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://ftp.icm.edu.pl/packages/qt/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://ftp.acc.umu.se/mirror/qt.io/qtproject/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://qt.mirror.constant.com/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://mirrors.sau.edu.cn/qt/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://mirrors.cloud.tencent.com/qt/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://mirror.bjtu.edu.cn/qt/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://mirrors.sjtug.sjtu.edu.cn/qt/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
- "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/6.7/6.7.3/single/qt-everywhere-src-6.7.3.tar.xz"
|
||||
sha256: "a3f1d257cbb14c6536585ffccf7c203ce7017418e1a0c2ed7c316c20c729c801"
|
||||
"6.6.3":
|
||||
url:
|
||||
- "https://download.qt.io/official_releases/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://download.qt.io/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://qt.mirror.constant.com/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://mirrors.ukfast.co.uk/sites/qt.io/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://mirrors.20i.com/pub/qt.io/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://ftp.nluug.nl/languages/qt/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://mirror.netcologne.de/qtproject/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://qt-mirror.dannhauer.de/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://ftp.fau.de/qtproject/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://mirrors.dotsrc.org/qtproject/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://ftp.icm.edu.pl/packages/qt/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://ftp.acc.umu.se/mirror/qt.io/qtproject/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://qtproject.mirror.liquidtelecom.com/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://mirrors.sau.edu.cn/qt/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://mirrors.tuna.tsinghua.edu.cn/qt/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://mirrors.ustc.edu.cn/qtproject/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://mirrors.sjtug.sjtu.edu.cn/qt/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
- "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
|
||||
sha256: "69d0348fef415da98aa890a34651e9cfb232f1bffcee289b7b4e21386bf36104"
|
||||
"6.5.3":
|
||||
url:
|
||||
- "https://download.qt.io/official_releases/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://download.qt.io/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://mirrors.20i.com/pub/qt.io/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://mirrors.ukfast.co.uk/sites/qt.io/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://ftp.nluug.nl/languages/qt/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://mirror.netcologne.de/qtproject/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://qt-mirror.dannhauer.de/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://ftp.fau.de/qtproject/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://mirrors.dotsrc.org/qtproject/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://ftp.acc.umu.se/mirror/qt.io/qtproject/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://mirror.web4africa.ng/qt/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://qtproject.mirror.liquidtelecom.com/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://qt.mirror.constant.com/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://mirrors.cloud.tencent.com/qt/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://mirrors.sjtug.sjtu.edu.cn/qt/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
- "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
|
||||
sha256: "7cda4d119aad27a3887329cfc285f2aba5da85601212bcb0aea27bd6b7b544cb"
|
||||
patches:
|
||||
"6.7.3":
|
||||
- "base_path": "qtwebengine"
|
||||
"patch_description": "Workaround for too long .rps file name"
|
||||
"patch_file": "patches/c72097e_6.6.0.diff"
|
||||
"patch_source": "https://codereview.qt-project.org/c/yocto/meta-qt5/+/192172"
|
||||
"patch_type": "bugfix"
|
||||
"6.6.3":
|
||||
- "base_path": "qtwebengine"
|
||||
"patch_description": "Workaround for too long .rps file name"
|
||||
"patch_file": "patches/c72097e_6.6.0.diff"
|
||||
"patch_source": "https://codereview.qt-project.org/c/yocto/meta-qt5/+/192172"
|
||||
"patch_type": "bugfix"
|
||||
"6.5.3":
|
||||
- "base_path": "qtwebengine"
|
||||
"patch_description": "Workaround for too long .rps file name"
|
||||
"patch_file": "patches/c72097e.diff"
|
||||
"patch_type": "bugfix"
|
||||
"patch_source": "https://codereview.qt-project.org/c/yocto/meta-qt5/+/192172"
|
||||
- "base_path": "qtbase"
|
||||
"patch_description": "Fix build error with lambda on GCC 9.2"
|
||||
"patch_file": "patches/32fa63f_6.5.0.patch"
|
||||
"patch_type": "bugfix"
|
||||
"patch_source": "https://bugreports.qt.io/browse/QTBUG-112920"
|
||||
- "base_path": "qtbase"
|
||||
"patch_description": "Use absolute path in the generated header files to avoid relative path longer than 250 characters (not supported on by msvc compiler)"
|
||||
"patch_file": "patches/fix-long-path-on-windows_6.5.3.patch"
|
||||
"patch_type": "bugfix"
|
||||
"patch_source": "https://code.qt.io/cgit/qt/qtbase.git/commit/?id=b4246a5c28472de3c4b6a85a3daf4a1d578894ab"
|
||||
1619
recipes/qt/6.x.x/conanfile.py
Normal file
1619
recipes/qt/6.x.x/conanfile.py
Normal file
File diff suppressed because it is too large
Load Diff
28
recipes/qt/6.x.x/patches/32fa63f.patch
Normal file
28
recipes/qt/6.x.x/patches/32fa63f.patch
Normal file
@@ -0,0 +1,28 @@
|
||||
From b404930e122013e76ba8fe165f3432288c051438 Mon Sep 17 00:00:00 2001
|
||||
From: shjiu <shanheng.jiu@qt.io>
|
||||
Date: Fri, 17 Nov 2023 09:41:31 +0900
|
||||
Subject: [PATCH] Fix build error with lambda on GCC 9.2
|
||||
|
||||
This patch is specific to the return type of updatePtrSimd function as boolean to avoid the bug of GCC 9.2.
|
||||
|
||||
Fixes: QTBUG-112920
|
||||
Pick-to: 6.7 6.6 6.5
|
||||
Change-Id: I21cb1f6dda34448b2290ab72ec280b6b2a3732c9
|
||||
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
||||
---
|
||||
src/corelib/text/qstring.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
|
||||
index 2dc415584f3..d9e89f8e5bb 100644
|
||||
--- a/src/corelib/text/qstring.cpp
|
||||
+++ b/src/corelib/text/qstring.cpp
|
||||
@@ -471,7 +471,7 @@ static bool simdTestMask(const char *&ptr, const char *end, quint32 maskval)
|
||||
if constexpr (UseSse4_1) {
|
||||
# ifndef Q_OS_QNX // compiler fails in the code below
|
||||
__m128i mask;
|
||||
- auto updatePtrSimd = [&](__m128i data) {
|
||||
+ auto updatePtrSimd = [&](__m128i data) -> bool {
|
||||
__m128i masked = _mm_and_si128(mask, data);
|
||||
__m128i comparison = _mm_cmpeq_epi16(masked, _mm_setzero_si128());
|
||||
uint result = _mm_movemask_epi8(comparison);
|
||||
28
recipes/qt/6.x.x/patches/32fa63f_6.5.0.patch
Normal file
28
recipes/qt/6.x.x/patches/32fa63f_6.5.0.patch
Normal file
@@ -0,0 +1,28 @@
|
||||
From b404930e122013e76ba8fe165f3432288c051438 Mon Sep 17 00:00:00 2001
|
||||
From: shjiu <shanheng.jiu@qt.io>
|
||||
Date: Fri, 17 Nov 2023 09:41:31 +0900
|
||||
Subject: [PATCH] Fix build error with lambda on GCC 9.2
|
||||
|
||||
This patch is specific to the return type of updatePtrSimd function as boolean to avoid the bug of GCC 9.2.
|
||||
|
||||
Fixes: QTBUG-112920
|
||||
Pick-to: 6.7 6.6 6.5
|
||||
Change-Id: I21cb1f6dda34448b2290ab72ec280b6b2a3732c9
|
||||
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
||||
---
|
||||
src/corelib/text/qstring.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
|
||||
index 2dc415584f3..d9e89f8e5bb 100644
|
||||
--- a/src/corelib/text/qstring.cpp
|
||||
+++ b/src/corelib/text/qstring.cpp
|
||||
@@ -461,7 +461,7 @@ static bool simdTestMask(const char *&ptr, const char *end, quint32 maskval)
|
||||
if constexpr (UseSse4_1) {
|
||||
# ifndef Q_OS_QNX // compiler fails in the code below
|
||||
__m128i mask;
|
||||
- auto updatePtrSimd = [&](__m128i data) {
|
||||
+ auto updatePtrSimd = [&](__m128i data) -> bool {
|
||||
__m128i masked = _mm_and_si128(mask, data);
|
||||
__m128i comparison = _mm_cmpeq_epi16(masked, _mm_setzero_si128());
|
||||
uint result = _mm_movemask_epi8(comparison);
|
||||
42
recipes/qt/6.x.x/patches/c72097e.diff
Normal file
42
recipes/qt/6.x.x/patches/c72097e.diff
Normal file
@@ -0,0 +1,42 @@
|
||||
From c72097e8790553771daf3231124c3fbe1a438379 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Thu, 30 Mar 2017 11:37:24 +0300
|
||||
Subject: [PATCH] chromium: workaround for too long .rps file name
|
||||
|
||||
Ninja may fail when the build directory is too long:
|
||||
|
||||
ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\
|
||||
interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\
|
||||
6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\
|
||||
.0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\
|
||||
le.rsp): Unable to create file. File name too long
|
||||
|
||||
Task-number: QTBUG-59769
|
||||
Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
|
||||
---
|
||||
src/3rdparty/gn/src/gn/ninja_action_target_writer.cc | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc b/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc
|
||||
index a5bc6cd..5cefbfe 100644
|
||||
--- a/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc
|
||||
+++ b/src/3rdparty/gn/tosrcols/gn/ninja_action_target_writer.cc
|
||||
@@ -122,9 +122,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
|
||||
// strictly necessary for regular one-shot actions, but it's easier to
|
||||
// just always define unique_name.
|
||||
std::string rspfile = custom_rule_name;
|
||||
+
|
||||
+ //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end
|
||||
+ //please note ".$unique_name" is not used at the moment
|
||||
+ int pos = 0;
|
||||
+ std::string delimiter("_");
|
||||
+ while (rspfile.length() > 250 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos)
|
||||
+ rspfile = rspfile.substr(0,pos);
|
||||
+
|
||||
if (!target_->sources().empty())
|
||||
rspfile += ".$unique_name";
|
||||
rspfile += ".rsp";
|
||||
+
|
||||
out_ << " rspfile = " << rspfile << std::endl;
|
||||
|
||||
// Response file contents.
|
||||
42
recipes/qt/6.x.x/patches/c72097e_6.6.0.diff
Normal file
42
recipes/qt/6.x.x/patches/c72097e_6.6.0.diff
Normal file
@@ -0,0 +1,42 @@
|
||||
From c72097e8790553771daf3231124c3fbe1a438379 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Thu, 30 Mar 2017 11:37:24 +0300
|
||||
Subject: [PATCH] chromium: workaround for too long .rps file name
|
||||
|
||||
Ninja may fail when the build directory is too long:
|
||||
|
||||
ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\
|
||||
interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\
|
||||
6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\
|
||||
.0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\
|
||||
le.rsp): Unable to create file. File name too long
|
||||
|
||||
Task-number: QTBUG-59769
|
||||
Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
|
||||
---
|
||||
src/3rdparty/gn/src/gn/ninja_action_target_writer.cc | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc b/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc
|
||||
index a5bc6cd..5cefbfe 100644
|
||||
--- a/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc
|
||||
+++ b/src/3rdparty/gn/tosrcols/gn/ninja_action_target_writer.cc
|
||||
@@ -125,9 +125,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
|
||||
// strictly necessary for regular one-shot actions, but it's easier to
|
||||
// just always define unique_name.
|
||||
std::string rspfile = custom_rule_name;
|
||||
+
|
||||
+ //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end
|
||||
+ //please note ".$unique_name" is not used at the moment
|
||||
+ int pos = 0;
|
||||
+ std::string delimiter("_");
|
||||
+ while (rspfile.length() > 250 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos)
|
||||
+ rspfile = rspfile.substr(0,pos);
|
||||
+
|
||||
if (!target_->sources().empty())
|
||||
rspfile += ".$unique_name";
|
||||
rspfile += ".rsp";
|
||||
+
|
||||
out_ << " rspfile = " << rspfile << std::endl;
|
||||
|
||||
// Response file contents.
|
||||
26
recipes/qt/6.x.x/patches/d13958d.diff
Normal file
26
recipes/qt/6.x.x/patches/d13958d.diff
Normal file
@@ -0,0 +1,26 @@
|
||||
From d13958dabb9f5542d772c6312cd33e4960bf1137 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Lemanissier <eric.lemanissier@gmail.com>
|
||||
Date: Tue, 29 Nov 2022 09:15:58 +0000
|
||||
Subject: [PATCH] fix pcre2 detection
|
||||
|
||||
Pick-to: 6.3
|
||||
Change-Id: I89f167e11bf1c72c9fae474ddd12380636ac5df8
|
||||
---
|
||||
|
||||
diff --git a/cmake/FindWrapSystemPCRE2.cmake b/cmake/FindWrapSystemPCRE2.cmake
|
||||
index f8516d3..3ac04b8 100644
|
||||
--- a/cmake/FindWrapSystemPCRE2.cmake
|
||||
+++ b/cmake/FindWrapSystemPCRE2.cmake
|
||||
@@ -6,11 +6,7 @@
|
||||
|
||||
find_package(PCRE2 ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} COMPONENTS 16BIT QUIET)
|
||||
|
||||
-# TODO: pcre2-16 is not the target name provided by the upstream Config file. It is PCRE2::16BIT.
|
||||
-# https://github.com/PCRE2Project/pcre2/blob/2410fbe3869cab403f02b94caa9ab37ee9f5854b/cmake/pcre2-config.cmake.in#L122
|
||||
-# We don't strictly need to handle that though, because the pkg-config code path below still
|
||||
-# finds the correct libraries.
|
||||
-set(__pcre2_target_name "PCRE2::pcre2-16")
|
||||
+set(__pcre2_target_name "PCRE2::16BIT")
|
||||
if(PCRE2_FOUND AND TARGET "${__pcre2_target_name}")
|
||||
# Hunter case.
|
||||
set(__pcre2_found TRUE)
|
||||
@@ -0,0 +1,16 @@
|
||||
--- a/src/tools/syncqt/main.cpp
|
||||
+++ b/src/tools/syncqt/main.cpp
|
||||
@@ -851,12 +851,7 @@
|
||||
|
||||
bool headerFileExists = std::filesystem::exists(headerFile);
|
||||
|
||||
- std::filesystem::path headerFileRootName =
|
||||
- std::filesystem::weakly_canonical(headerFile, ec).root_name();
|
||||
- std::string aliasedFilepath = !ec && headerFileRootName == m_outputRootName
|
||||
- ? std::filesystem::relative(headerFile, outputDir).generic_string()
|
||||
- : headerFile.generic_string();
|
||||
- ec.clear();
|
||||
+ std::string aliasedFilepath = headerFile.generic_string();
|
||||
|
||||
std::string aliasPath = outputDir + '/' + m_currentFilename;
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
--- a/src/tools/syncqt/main.cpp
|
||||
+++ b/src/tools/syncqt/main.cpp
|
||||
@@ -875,12 +875,7 @@
|
||||
|
||||
bool headerFileExists = std::filesystem::exists(headerFile);
|
||||
|
||||
- std::filesystem::path headerFileRootName =
|
||||
- std::filesystem::weakly_canonical(headerFile, ec).root_name();
|
||||
- std::string aliasedFilepath = !ec && headerFileRootName == m_outputRootName
|
||||
- ? std::filesystem::relative(headerFile, outputDir).generic_string()
|
||||
- : headerFile.generic_string();
|
||||
- ec.clear();
|
||||
+ std::string aliasedFilepath = headerFile.generic_string();
|
||||
|
||||
std::string aliasPath = outputDir + '/' + m_currentFilename;
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
--- a/src/tools/syncqt/main.cpp
|
||||
+++ b/src/tools/syncqt/main.cpp
|
||||
@@ -866,12 +866,7 @@
|
||||
|
||||
bool headerFileExists = std::filesystem::exists(headerFile);
|
||||
|
||||
- std::filesystem::path headerFileRootName =
|
||||
- std::filesystem::weakly_canonical(headerFile, ec).root_name();
|
||||
- std::string aliasedFilepath = !ec && headerFileRootName == m_outputRootName
|
||||
- ? std::filesystem::relative(headerFile, outputDir).generic_string()
|
||||
- : headerFile.generic_string();
|
||||
- ec.clear();
|
||||
+ std::string aliasedFilepath = headerFile.generic_string();
|
||||
|
||||
std::string aliasPath = outputDir + '/' + m_currentFilename;
|
||||
|
||||
45
recipes/qt/6.x.x/patches/fix_cmake3.28.patch
Normal file
45
recipes/qt/6.x.x/patches/fix_cmake3.28.patch
Normal file
@@ -0,0 +1,45 @@
|
||||
From 0efea8020c1d221635aaa0a71529edb392cfe3cc Mon Sep 17 00:00:00 2001
|
||||
From: Joerg Bornemann <joerg.bornemann@qt.io>
|
||||
Date: Mon, 11 Sep 2023 14:48:32 +0200
|
||||
Subject: [PATCH] CMake: Fix build with CMake 3.28 on macOS
|
||||
|
||||
FindWrapOpenGL.cmake assumed that IMPORTED_LOCATION is the absolute path
|
||||
of the library within the framework. That's not the case with CMake 3.28
|
||||
anymore. There, IMPORTED_LOCATION is the absolute path of the framework
|
||||
directory.
|
||||
|
||||
The relevant upstream CMake change is
|
||||
6b01a27f901b5eb392955fea322cde44a1b782a3.
|
||||
|
||||
Pick-to: 6.2 6.5 6.6
|
||||
Change-Id: I6b702a28318e0978c56dec83c398965aa77ef020
|
||||
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
||||
---
|
||||
cmake/FindWrapOpenGL.cmake | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cmake/FindWrapOpenGL.cmake b/cmake/FindWrapOpenGL.cmake
|
||||
index 3e6abaf4dda..7295a159caf 100644
|
||||
--- a/cmake/FindWrapOpenGL.cmake
|
||||
+++ b/cmake/FindWrapOpenGL.cmake
|
||||
@@ -14,14 +14,18 @@
|
||||
|
||||
add_library(WrapOpenGL::WrapOpenGL INTERFACE IMPORTED)
|
||||
if(APPLE)
|
||||
+ # CMake 3.27 and older:
|
||||
# On Darwin platforms FindOpenGL sets IMPORTED_LOCATION to the absolute path of the library
|
||||
# within the framework. This ends up as an absolute path link flag, which we don't want,
|
||||
# because that makes our .prl files un-relocatable.
|
||||
# Extract the framework path instead, and use that in INTERFACE_LINK_LIBRARIES,
|
||||
- # which CMake ends up transforming into a reloctable -framework flag.
|
||||
+ # which CMake ends up transforming into a relocatable -framework flag.
|
||||
# See https://gitlab.kitware.com/cmake/cmake/-/issues/20871 for details.
|
||||
+ #
|
||||
+ # CMake 3.28 and above:
|
||||
+ # IMPORTED_LOCATION is the absolute path the the OpenGL.framework folder.
|
||||
get_target_property(__opengl_fw_lib_path OpenGL::GL IMPORTED_LOCATION)
|
||||
- if(__opengl_fw_lib_path)
|
||||
+ if(__opengl_fw_lib_path AND NOT __opengl_fw_lib_path MATCHES "/([^/]+)\\.framework$")
|
||||
get_filename_component(__opengl_fw_path "${__opengl_fw_lib_path}" DIRECTORY)
|
||||
endif()
|
||||
|
||||
15
recipes/qt/6.x.x/patches/qt6-pri-helpers-fix.diff
Normal file
15
recipes/qt/6.x.x/patches/qt6-pri-helpers-fix.diff
Normal file
@@ -0,0 +1,15 @@
|
||||
--- QtPriHelpers.cmake.original 2021-08-03 23:38:06.343653948 +0300
|
||||
+++ QtPriHelpers.cmake 2021-08-03 23:26:24.483637483 +0300
|
||||
@@ -30,7 +30,11 @@
|
||||
if(lib_target_type STREQUAL "INTERFACE_LIBRARY")
|
||||
get_target_property(iface_libs ${lib_target} INTERFACE_LINK_LIBRARIES)
|
||||
if(iface_libs)
|
||||
- list(PREPEND lib_targets ${iface_libs})
|
||||
+ foreach (iface_lib ${iface_libs})
|
||||
+ if (NOT "${iface_lib}" STREQUAL "${lib_target}")
|
||||
+ list(PREPEND lib_targets ${iface_lib})
|
||||
+ endif ()
|
||||
+ endforeach ()
|
||||
endif()
|
||||
else()
|
||||
list(APPEND lib_libs "$<TARGET_LINKER_FILE:${lib_target}>")
|
||||
332
recipes/qt/6.x.x/qtmodules6.5.3.conf
Normal file
332
recipes/qt/6.x.x/qtmodules6.5.3.conf
Normal file
@@ -0,0 +1,332 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.5.3
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.5.3
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative qtquick3d
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.5.3
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.5.3
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtshadertools qtwebengine
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.5.3
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
project = -
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase qtpositioning
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.5.3
|
||||
status = preview
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.5.3
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtlanguageserver"]
|
||||
depends = qtbase
|
||||
path = qtlanguageserver
|
||||
url = ../qtlanguageserver.git
|
||||
branch = 6.5.3
|
||||
status = preview
|
||||
[submodule "qthttpserver"]
|
||||
depends = qtbase
|
||||
recommends = qtwebsockets
|
||||
path = qthttpserver
|
||||
url = ../qthttpserver.git
|
||||
branch = 6.5.3
|
||||
status = preview
|
||||
[submodule "qtquick3dphysics"]
|
||||
depends = qtbase qtdeclarative qtquick3d qtshadertools
|
||||
path = qtquick3dphysics
|
||||
url = ../qtquick3dphysics.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
[submodule "qtgrpc"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgrpc
|
||||
url = ../qtgrpc.git
|
||||
branch = 6.5.3
|
||||
status = preview
|
||||
[submodule "qtquickeffectmaker"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquick3d
|
||||
path = qtquickeffectmaker
|
||||
url = ../qtquickeffectmaker.git
|
||||
branch = 6.5.3
|
||||
status = addon
|
||||
338
recipes/qt/6.x.x/qtmodules6.6.3.conf
Normal file
338
recipes/qt/6.x.x/qtmodules6.6.3.conf
Normal file
@@ -0,0 +1,338 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.6.3
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.6.3
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative qtquick3d
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.6.3
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.6.3
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtshadertools qtwebengine
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.6.3
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
project = -
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase qtpositioning
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.6.3
|
||||
status = preview
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools qtmultimedia
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.6.3
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtlanguageserver"]
|
||||
depends = qtbase
|
||||
path = qtlanguageserver
|
||||
url = ../qtlanguageserver.git
|
||||
branch = 6.6.3
|
||||
status = preview
|
||||
[submodule "qthttpserver"]
|
||||
depends = qtbase
|
||||
recommends = qtwebsockets
|
||||
path = qthttpserver
|
||||
url = ../qthttpserver.git
|
||||
branch = 6.6.3
|
||||
status = preview
|
||||
[submodule "qtquick3dphysics"]
|
||||
depends = qtbase qtdeclarative qtquick3d qtshadertools
|
||||
path = qtquick3dphysics
|
||||
url = ../qtquick3dphysics.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtgrpc"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgrpc
|
||||
url = ../qtgrpc.git
|
||||
branch = 6.6.3
|
||||
status = preview
|
||||
[submodule "qtquickeffectmaker"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquick3d
|
||||
path = qtquickeffectmaker
|
||||
url = ../qtquickeffectmaker.git
|
||||
branch = 6.6.3
|
||||
status = addon
|
||||
[submodule "qtgraphs"]
|
||||
depends = qtbase qtdeclarative qtquick3d
|
||||
path = qtgraphs
|
||||
url = ../qtgraphs.git
|
||||
branch = 6.6.3
|
||||
status = preview
|
||||
338
recipes/qt/6.x.x/qtmodules6.7.3.conf
Normal file
338
recipes/qt/6.x.x/qtmodules6.7.3.conf
Normal file
@@ -0,0 +1,338 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.7.3
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.7.3
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative qtquick3d
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.7.3
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.7.3
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtshadertools qtwebengine
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.7.3
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
project = -
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase qtpositioning
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.7.3
|
||||
status = preview
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools qtmultimedia
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase qtmultimedia
|
||||
recommends = qtdeclarative
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.7.3
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtlanguageserver"]
|
||||
depends = qtbase
|
||||
path = qtlanguageserver
|
||||
url = ../qtlanguageserver.git
|
||||
branch = 6.7.3
|
||||
status = preview
|
||||
[submodule "qthttpserver"]
|
||||
depends = qtbase
|
||||
recommends = qtwebsockets
|
||||
path = qthttpserver
|
||||
url = ../qthttpserver.git
|
||||
branch = 6.7.3
|
||||
status = preview
|
||||
[submodule "qtquick3dphysics"]
|
||||
depends = qtbase qtdeclarative qtquick3d qtshadertools
|
||||
path = qtquick3dphysics
|
||||
url = ../qtquick3dphysics.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtgrpc"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgrpc
|
||||
url = ../qtgrpc.git
|
||||
branch = 6.7.3
|
||||
status = preview
|
||||
[submodule "qtquickeffectmaker"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquick3d
|
||||
path = qtquickeffectmaker
|
||||
url = ../qtquickeffectmaker.git
|
||||
branch = 6.7.3
|
||||
status = addon
|
||||
[submodule "qtgraphs"]
|
||||
depends = qtbase qtdeclarative qtquick3d
|
||||
path = qtgraphs
|
||||
url = ../qtgraphs.git
|
||||
branch = 6.7.3
|
||||
status = preview
|
||||
18
recipes/qt/6.x.x/test_package/CMakeLists.txt
Normal file
18
recipes/qt/6.x.x/test_package/CMakeLists.txt
Normal file
@@ -0,0 +1,18 @@
|
||||
cmake_minimum_required(VERSION 3.8)
|
||||
project(test_package LANGUAGES CXX)
|
||||
|
||||
find_package(Qt6 COMPONENTS Core Network Sql Concurrent Xml REQUIRED CONFIG)
|
||||
|
||||
add_executable(${PROJECT_NAME} test_package.cpp greeter.h example.qrc)
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Core Qt6::Network Qt6::Sql Qt6::Concurrent Qt6::Xml Qt6::Widgets)
|
||||
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
|
||||
set_target_properties(${PROJECT_NAME} PROPERTIES AUTOMOC ON AUTORCC ON)
|
||||
|
||||
# Only running this Qt macros in macOS
|
||||
if (APPLE)
|
||||
# Related to https://github.com/conan-io/conan-center-index/issues/20574
|
||||
qt_standard_project_setup()
|
||||
qt_add_executable(test_macos_bundle MACOSX_BUNDLE test_macos_bundle.cpp)
|
||||
target_link_libraries(test_macos_bundle PRIVATE Qt6::Core)
|
||||
target_compile_features(test_macos_bundle PRIVATE cxx_std_17)
|
||||
endif()
|
||||
47
recipes/qt/6.x.x/test_package/conanfile.py
Normal file
47
recipes/qt/6.x.x/test_package/conanfile.py
Normal file
@@ -0,0 +1,47 @@
|
||||
import os
|
||||
|
||||
from conan import ConanFile
|
||||
from conan.tools.build import can_run
|
||||
from conan.tools.cmake import CMake, cmake_layout
|
||||
from conan.tools.env import VirtualRunEnv
|
||||
from conan.tools.files import copy, save
|
||||
|
||||
|
||||
class TestPackageConan(ConanFile):
|
||||
settings = "os", "arch", "compiler", "build_type"
|
||||
generators = "CMakeDeps", "CMakeToolchain", "VirtualBuildEnv"
|
||||
test_type = "explicit"
|
||||
|
||||
def layout(self):
|
||||
cmake_layout(self)
|
||||
|
||||
def requirements(self):
|
||||
self.requires(self.tested_reference_str, run=can_run(self))
|
||||
|
||||
def build_requirements(self):
|
||||
if not can_run(self):
|
||||
self.tool_requires(self.tested_reference_str)
|
||||
|
||||
def generate(self):
|
||||
path = self.dependencies["qt"].package_folder.replace("\\", "/")
|
||||
save(self, "qt.conf", f"""[Paths]
|
||||
Prefix = {path}""")
|
||||
|
||||
VirtualRunEnv(self).generate()
|
||||
if can_run(self):
|
||||
VirtualRunEnv(self).generate(scope="build")
|
||||
|
||||
def build(self):
|
||||
cmake = CMake(self)
|
||||
cmake.configure()
|
||||
cmake.build()
|
||||
|
||||
def test(self):
|
||||
if can_run(self):
|
||||
copy(self, "qt.conf", src=self.generators_folder, dst=os.path.join(self.cpp.build.bindirs[0]))
|
||||
bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package")
|
||||
self.run(bin_path, env="conanrun")
|
||||
# Related to https://github.com/conan-io/conan-center-index/issues/20574
|
||||
if self.settings.os == "Macos":
|
||||
bin_macos_path = os.path.join(self.cpp.build.bindirs[0], "test_macos_bundle.app", "Contents", "MacOS", "test_macos_bundle")
|
||||
self.run(bin_macos_path, env="conanrun")
|
||||
5
recipes/qt/6.x.x/test_package/example.qrc
Normal file
5
recipes/qt/6.x.x/test_package/example.qrc
Normal file
@@ -0,0 +1,5 @@
|
||||
<RCC>
|
||||
<qresource>
|
||||
<file>resource.txt</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
26
recipes/qt/6.x.x/test_package/greeter.h
Normal file
26
recipes/qt/6.x.x/test_package/greeter.h
Normal file
@@ -0,0 +1,26 @@
|
||||
#include <QDebug>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
|
||||
class Greeter : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Greeter(const QString& name, QObject *parent = 0)
|
||||
: QObject(parent)
|
||||
, mName(name) {}
|
||||
|
||||
public slots:
|
||||
void run()
|
||||
{
|
||||
qDebug() << QString("Hello %1!").arg(mName);
|
||||
|
||||
emit finished();
|
||||
}
|
||||
|
||||
signals:
|
||||
void finished();
|
||||
|
||||
private:
|
||||
const QString& mName;
|
||||
};
|
||||
1
recipes/qt/6.x.x/test_package/resource.txt
Normal file
1
recipes/qt/6.x.x/test_package/resource.txt
Normal file
@@ -0,0 +1 @@
|
||||
Hello World From Resource
|
||||
7
recipes/qt/6.x.x/test_package/test_macos_bundle.cpp
Normal file
7
recipes/qt/6.x.x/test_package/test_macos_bundle.cpp
Normal file
@@ -0,0 +1,7 @@
|
||||
#include <QCoreApplication>
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
QCoreApplication app(argc, argv);
|
||||
return 0;
|
||||
}
|
||||
48
recipes/qt/6.x.x/test_package/test_package.cpp
Normal file
48
recipes/qt/6.x.x/test_package/test_package.cpp
Normal file
@@ -0,0 +1,48 @@
|
||||
#include <QCoreApplication>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QTimer>
|
||||
#include <QFile>
|
||||
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QSqlDatabase>
|
||||
#include <qtconcurrentfilter.h>
|
||||
#include <QDomText>
|
||||
|
||||
#include "greeter.h"
|
||||
|
||||
int main(int argc, char *argv[]){
|
||||
QCoreApplication app(argc, argv);
|
||||
QCoreApplication::setApplicationName("Application Example");
|
||||
QCoreApplication::setApplicationVersion("1.0.0");
|
||||
|
||||
QString name = argc > 0 ? argv[1] : "";
|
||||
if (name.isEmpty()) {
|
||||
name = "World";
|
||||
}
|
||||
|
||||
Greeter* greeter = new Greeter(name, &app);
|
||||
QObject::connect(greeter, SIGNAL(finished()), &app, SLOT(quit()));
|
||||
QTimer::singleShot(0, greeter, SLOT(run()));
|
||||
|
||||
QFile f(":/resource.txt");
|
||||
if(!f.open(QIODevice::ReadOnly))
|
||||
qFatal("Could not open resource file");
|
||||
qDebug() << "Resource content:" << f.readAll();
|
||||
f.close();
|
||||
|
||||
QNetworkAccessManager networkTester;
|
||||
|
||||
QSqlDatabase sqlTester;
|
||||
|
||||
QVector<int> v;
|
||||
v << 1 << 2 << 3 << 4;
|
||||
QtConcurrent::blockingFilter(v, [](int i)
|
||||
{
|
||||
return i % 2;
|
||||
});
|
||||
|
||||
QDomText xmlTester;
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
25
recipes/qt/6.x.x/test_v1_package/CMakeLists.txt
Normal file
25
recipes/qt/6.x.x/test_v1_package/CMakeLists.txt
Normal file
@@ -0,0 +1,25 @@
|
||||
cmake_minimum_required(VERSION 3.3.0)
|
||||
|
||||
project(test_package)
|
||||
|
||||
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
|
||||
conan_set_vs_runtime()
|
||||
conan_set_libcxx()
|
||||
conan_output_dirs_setup()
|
||||
|
||||
find_package(Qt6 COMPONENTS Core Network Sql Concurrent Xml REQUIRED CONFIG)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
add_executable(${PROJECT_NAME} ../test_package/test_package.cpp ../test_package/greeter.h ../test_package/example.qrc)
|
||||
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME} Qt6::Core Qt6::Network Qt6::Sql Qt6::Concurrent Qt6::Xml)
|
||||
|
||||
# check if extra qt cmake functions are usable
|
||||
qt_add_executable(${PROJECT_NAME}2 ../test_package/test_package.cpp ../test_package/greeter.h ../test_package/example.qrc)
|
||||
|
||||
set_property(TARGET ${PROJECT_NAME}2 PROPERTY CXX_STANDARD 17)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME}2 PRIVATE Qt6::Core Qt6::Network Qt6::Sql Qt6::Concurrent Qt6::Xml)
|
||||
134
recipes/qt/6.x.x/test_v1_package/conanfile.py
Normal file
134
recipes/qt/6.x.x/test_v1_package/conanfile.py
Normal file
@@ -0,0 +1,134 @@
|
||||
import os
|
||||
import shutil
|
||||
|
||||
from conan import ConanFile
|
||||
from conan.tools.build import cross_building
|
||||
from conan.tools.files import mkdir, chdir, save
|
||||
from conan.tools.microsoft import is_msvc
|
||||
from conan.tools.scm import Version
|
||||
|
||||
from conans import tools, Meson, RunEnvironment, CMake
|
||||
from conan.errors import ConanException
|
||||
|
||||
|
||||
class TestPackageConan(ConanFile):
|
||||
settings = "os", "compiler", "build_type", "arch"
|
||||
generators = "cmake", "cmake_find_package_multi", "cmake_find_package", "pkg_config", "qmake"
|
||||
|
||||
def build_requirements(self):
|
||||
self.tool_requires("cmake/3.25.3")
|
||||
if self._meson_supported():
|
||||
self.tool_requires("meson/1.1.0")
|
||||
|
||||
def generate(self):
|
||||
save(self, "qt.conf", """[Paths]
|
||||
Prefix = {}""".format(self.dependencies["qt"].package_folder.replace('\\', '/')))
|
||||
|
||||
def _is_mingw(self):
|
||||
return self.settings.os == "Windows" and self.settings.compiler == "gcc"
|
||||
|
||||
def _meson_supported(self):
|
||||
return False and self.options["qt"].shared and\
|
||||
not cross_building(self) and\
|
||||
not self.settings.os == "Macos" and\
|
||||
not self._is_mingw()
|
||||
|
||||
def _qmake_supported(self):
|
||||
return self.options["qt"].shared
|
||||
|
||||
def _build_with_qmake(self):
|
||||
if not self._qmake_supported():
|
||||
return
|
||||
mkdir(self, "qmake_folder")
|
||||
with chdir(self, "qmake_folder"):
|
||||
self.output.info("Building with qmake")
|
||||
|
||||
with tools.vcvars(self.settings) if is_msvc(self) else tools.no_op():
|
||||
args = [self.source_folder, "DESTDIR=bin"]
|
||||
|
||||
def _getenvpath(var):
|
||||
val = os.getenv(var)
|
||||
if val and tools.os_info.is_windows:
|
||||
val = val.replace("\\", "/")
|
||||
os.environ[var] = val
|
||||
return val
|
||||
|
||||
value = _getenvpath('CC')
|
||||
if value:
|
||||
args.append(f"QMAKE_CC=\"{value}\"")
|
||||
|
||||
value = _getenvpath('CXX')
|
||||
if value:
|
||||
args.append(f"QMAKE_CXX=\"{value}\"")
|
||||
|
||||
value = _getenvpath('LD')
|
||||
if value:
|
||||
args.append(f"QMAKE_LINK_C=\"{value}\"")
|
||||
args.append(f"QMAKE_LINK_C_SHLIB=\"{value}\"")
|
||||
args.append(f"QMAKE_LINK=\"{value}\"")
|
||||
args.append(f"QMAKE_LINK_SHLIB=\"{value}\"")
|
||||
|
||||
self.run(f"qmake {' '.join(args)}", run_environment=True)
|
||||
if tools.os_info.is_windows:
|
||||
if is_msvc(self):
|
||||
self.run("nmake", run_environment=True)
|
||||
else:
|
||||
self.run("mingw32-make", run_environment=True)
|
||||
else:
|
||||
self.run("make", run_environment=True)
|
||||
|
||||
def _build_with_meson(self):
|
||||
if self._meson_supported():
|
||||
self.output.info("Building with Meson")
|
||||
mkdir(self, "meson_folder")
|
||||
with tools.environment_append(RunEnvironment(self).vars):
|
||||
meson = Meson(self)
|
||||
try:
|
||||
meson.configure(build_folder="meson_folder", defs={"cpp_std": "c++11"})
|
||||
except ConanException:
|
||||
self.output.info(open("meson_folder/meson-logs/meson-log.txt", 'r').read())
|
||||
raise
|
||||
meson.build()
|
||||
|
||||
def _build_with_cmake_find_package_multi(self):
|
||||
self.output.info("Building with cmake_find_package_multi")
|
||||
env_build = RunEnvironment(self)
|
||||
with tools.environment_append(env_build.vars):
|
||||
cmake = CMake(self, set_cmake_flags=True)
|
||||
if self.settings.os == "Macos":
|
||||
cmake.definitions['CMAKE_OSX_DEPLOYMENT_TARGET'] = '10.15' if Version(self.deps_cpp_info["qt"].version) >= "6.5.0" else "10.14"
|
||||
|
||||
cmake.configure()
|
||||
cmake.build()
|
||||
|
||||
def build(self):
|
||||
self._build_with_qmake()
|
||||
self._build_with_meson()
|
||||
self._build_with_cmake_find_package_multi()
|
||||
|
||||
def _test_with_qmake(self):
|
||||
if not self._qmake_supported():
|
||||
return
|
||||
self.output.info("Testing qmake")
|
||||
bin_path = os.path.join("qmake_folder", "bin")
|
||||
if self.settings.os == "Macos":
|
||||
bin_path = os.path.join(bin_path, "test_package.app", "Contents", "MacOS")
|
||||
shutil.copy("qt.conf", bin_path)
|
||||
self.run(os.path.join(bin_path, "test_package"), run_environment=True)
|
||||
|
||||
def _test_with_meson(self):
|
||||
if self._meson_supported():
|
||||
self.output.info("Testing Meson")
|
||||
shutil.copy("qt.conf", "meson_folder")
|
||||
self.run(os.path.join("meson_folder", "test_package"), run_environment=True)
|
||||
|
||||
def _test_with_cmake_find_package_multi(self):
|
||||
self.output.info("Testing CMake_find_package_multi")
|
||||
shutil.copy("qt.conf", "bin")
|
||||
self.run(os.path.join("bin", "test_package"), run_environment=True)
|
||||
|
||||
def test(self):
|
||||
if not cross_building(self, skip_x64_x86=True):
|
||||
self._test_with_qmake()
|
||||
self._test_with_meson()
|
||||
self._test_with_cmake_find_package_multi()
|
||||
6
recipes/qt/6.x.x/test_v1_package/meson.build
Normal file
6
recipes/qt/6.x.x/test_v1_package/meson.build
Normal file
@@ -0,0 +1,6 @@
|
||||
project('test_package', 'cpp')
|
||||
qt6 = import('qt6')
|
||||
qt6_dep = dependency('qt6', modules: ['Core', 'Network', 'Sql', 'Concurrent', 'Xml'])
|
||||
moc_files = qt6.preprocess(moc_headers : 'greeter.h', qresources : 'example.qrc')
|
||||
executable('test_package', 'test_package.cpp', moc_files,
|
||||
dependencies : qt6_dep)
|
||||
14
recipes/qt/6.x.x/test_v1_package/test_package.pro
Normal file
14
recipes/qt/6.x.x/test_v1_package/test_package.pro
Normal file
@@ -0,0 +1,14 @@
|
||||
SOURCES += ../test_package/test_package.cpp
|
||||
|
||||
HEADERS += ../test_package/greeter.h
|
||||
|
||||
RESOURCES = ../test_package/example.qrc
|
||||
|
||||
QT -= gui
|
||||
QT += network sql concurrent xml
|
||||
|
||||
CONFIG += console
|
||||
|
||||
CONFIG += conan_basic_setup
|
||||
include($$OUT_PWD/../conanbuildinfo.pri)
|
||||
LIBS -= $$CONAN_LIBS_QT
|
||||
Reference in New Issue
Block a user