[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
48
recipes/qt/5.x.x/conandata.yml
Normal file
48
recipes/qt/5.x.x/conandata.yml
Normal file
@@ -0,0 +1,48 @@
|
||||
sources:
|
||||
"5.15.16":
|
||||
url:
|
||||
- "https://nexus.avroid.tech/repository/all-raw-proxy-mirror_netcologne_de/qtproject/archive/qt/5.15/5.15.16/single/qt-everywhere-opensource-src-5.15.16.tar.xz"
|
||||
sha256: "efa99827027782974356aceff8a52bd3d2a8a93a54dd0db4cca41b5e35f1041c"
|
||||
"5.15.14":
|
||||
url:
|
||||
- "https://nexus.avroid.tech/repository/all-raw-proxy-mirror_netcologne_de/qtproject/archive/qt/5.15/5.15.14/single/qt-everywhere-opensource-src-5.15.14.tar.xz"
|
||||
sha256: "fdd3a4f197d2c800ee0085c721f4bef60951cbda9e9c46e525d1412f74264ed7"
|
||||
patches:
|
||||
"5.15.16":
|
||||
- "base_path": "qt5/qtbase"
|
||||
"patch_file": "patches/aa2a39dea5.diff"
|
||||
- "base_path": "qt5/qtwebengine"
|
||||
"patch_file": "patches/c72097e.diff"
|
||||
- "base_path": "qt5/qtdeclarative"
|
||||
"patch_file": "patches/qtdeclarative-1-fixes.patch"
|
||||
- "base_path": "qt5/qttools"
|
||||
"patch_file": "patches/qttools-1-fixes.patch"
|
||||
- "base_path": "qt5/qtconnectivity"
|
||||
"patch_file": "patches/qtconnectivity-1-fixes.patch"
|
||||
- "base_path": "qt5/qtlocation"
|
||||
"patch_file": "patches/qtlocation-1.patch"
|
||||
- "base_path": "qt5/qtmultimedia"
|
||||
"patch_file": "patches/qtmultimedia-1.patch"
|
||||
- "base_path": "qt5/qttools"
|
||||
"patch_file": "patches/fix-macdeployqt.diff"
|
||||
- "base_path": "qt5/qtwebengine/src/3rdparty"
|
||||
"patch_file": "patches/0001-Find-fontconfig-using-pkg-config.patch"
|
||||
- "base_path": "qt5/qtbase"
|
||||
"patch_file": "patches/android-openssl.diff"
|
||||
- "base_path": "qt5/qtwebengine"
|
||||
"patch_description": "qtwebengine don't use rpath-link on macOS"
|
||||
"patch_file": "patches/5.15.14-macos-qtwebengine-rpath-link.patch"
|
||||
- "base_path": "qt5/qtlocation"
|
||||
"patch_description": "qtlocation missing utility header"
|
||||
"patch_file": "patches/5.15.14-macos-qtlocation-utility-header.patch"
|
||||
- "base_path": "qt5/qtwebengine/src/3rdparty"
|
||||
"patch_description": "qtwebengine fix missing headers"
|
||||
"patch_file": "patches/5.15.14-qtwebengine-missing-deps.patch"
|
||||
- "base_path": "qt5/qtwebengine/src/3rdparty"
|
||||
"patch_description": "macos fix chromium build in newer macos SDKs"
|
||||
"patch_file": "patches/5.15.14-macos-chromium-newer-sdks.patch"
|
||||
- "base_path": "qt5/qtwebengine"
|
||||
"patch_description": "Fix build error with binutils >= 2.41"
|
||||
"patch_file": "patches/ffmpeg-x86-optimization.patch"
|
||||
"patch_source": "https://packages.ubuntu.com/source/focal-updates/qtwebengine-opensource-src"
|
||||
"patch_type": "portability"
|
||||
1591
recipes/qt/5.x.x/conanfile.py
Normal file
1591
recipes/qt/5.x.x/conanfile.py
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,56 @@
|
||||
From fb103459151fcf02706dd5abda95c716a934d610 Mon Sep 17 00:00:00 2001
|
||||
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
Date: Mon, 9 May 2022 10:32:24 +0200
|
||||
Subject: [PATCH] Find fontconfig using pkg-config
|
||||
|
||||
We already verify that it can be found like that during configure
|
||||
|
||||
Task-number: QTBUG-61158
|
||||
Change-Id: I569590e96a490c4ed6e6dc560fbd110d86d77956
|
||||
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
||||
(cherry picked from commit 357dcbf7d9510b5282a18e8211e2494f353b4e5e)
|
||||
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
||||
(cherry picked from commit 43329f9d7f38a5092a9c054c5d450072b236c6f8)
|
||||
---
|
||||
chromium/components/services/font/BUILD.gn | 1 +
|
||||
chromium/third_party/fontconfig/BUILD.gn | 5 +++--
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git chromium/components/services/font/BUILD.gn chromium/components/services/font/BUILD.gn
|
||||
index b065131e035..f3e544ed29f 100644
|
||||
--- chromium/components/services/font/BUILD.gn
|
||||
+++ chromium/components/services/font/BUILD.gn
|
||||
@@ -42,6 +42,7 @@ if ((is_linux || is_chromeos) && enable_plugins) {
|
||||
"//base:base",
|
||||
"//ppapi/buildflags:buildflags",
|
||||
"//ppapi/c",
|
||||
+ "//third_party/fontconfig",
|
||||
]
|
||||
}
|
||||
}
|
||||
diff --git chromium/third_party/fontconfig/BUILD.gn chromium/third_party/fontconfig/BUILD.gn
|
||||
index 1bee7acb6b9..4cc32d62774 100644
|
||||
--- chromium/third_party/fontconfig/BUILD.gn
|
||||
+++ chromium/third_party/fontconfig/BUILD.gn
|
||||
@@ -3,6 +3,7 @@
|
||||
# found in the LICENSE file.
|
||||
|
||||
import("//build/config/sanitizers/sanitizers.gni")
|
||||
+import("//build/config/linux/pkg_config.gni")
|
||||
import("//third_party/fontconfig/fontconfig.gni")
|
||||
|
||||
assert(is_linux || is_chromeos)
|
||||
@@ -110,8 +111,8 @@ if (use_bundled_fontconfig) {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
- config("fontconfig_config") {
|
||||
- libs = [ "fontconfig" ]
|
||||
+ pkg_config("fontconfig_config") {
|
||||
+ packages = [ "fontconfig" ]
|
||||
}
|
||||
|
||||
group("fontconfig") {
|
||||
--
|
||||
2.36.1
|
||||
|
||||
39
recipes/qt/5.x.x/patches/337f28c9ab-5.15.8.patch
Normal file
39
recipes/qt/5.x.x/patches/337f28c9ab-5.15.8.patch
Normal file
@@ -0,0 +1,39 @@
|
||||
From 337f28c9abb12f28538cfe2f49e5afc460578b32 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
|
||||
Date: Tue, 5 Jul 2022 15:38:33 +0200
|
||||
Subject: Darwin: Replace deprecated symbol kIOMasterPortDefault with
|
||||
equivalent
|
||||
|
||||
We can't use the replacement kIOMainPortDefault yet, as it's not
|
||||
available in operating system versions we still support, but the
|
||||
kIOMasterPortDefault documentation explicitly says that passing
|
||||
NULL as a port argument indicates "use the default".
|
||||
|
||||
As the underlying type of a mach_port_t is potentially either
|
||||
a pointer or an unsigned int, we initialize the default to 0.
|
||||
|
||||
Pick-to: 6.2 6.3 6.4 5.15
|
||||
Change-Id: I288aa94b8f2fbda47fd1cbaf329799db7ab988a0
|
||||
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
||||
---
|
||||
src/corelib/global/qglobal.cpp | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
(limited to 'src/corelib/global/qglobal.cpp')
|
||||
|
||||
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
|
||||
index 738e39658f..c894471ad6 100644
|
||||
--- a/src/corelib/global/qglobal.cpp
|
||||
+++ b/src/corelib/global/qglobal.cpp
|
||||
@@ -3077,7 +3077,8 @@ QByteArray QSysInfo::machineUniqueId()
|
||||
{
|
||||
#if defined(Q_OS_DARWIN) && __has_include(<IOKit/IOKitLib.h>)
|
||||
char uuid[UuidStringLen + 1];
|
||||
- io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"));
|
||||
+ static const mach_port_t defaultPort = 0; // Effectively kIOMasterPortDefault/kIOMainPortDefault
|
||||
+ io_service_t service = IOServiceGetMatchingService(defaultPort, IOServiceMatching("IOPlatformExpertDevice"));
|
||||
QCFString stringRef = (CFStringRef)IORegistryEntryCreateCFProperty(service, CFSTR(kIOPlatformUUIDKey), kCFAllocatorDefault, 0);
|
||||
CFStringGetCString(stringRef, uuid, sizeof(uuid), kCFStringEncodingMacRoman);
|
||||
return QByteArray(uuid);
|
||||
--
|
||||
cgit v1.2.1
|
||||
@@ -0,0 +1,43 @@
|
||||
--- a/src/corelib/global/qcompilerdetection.h
|
||||
+++ b/src/corelib/global/qcompilerdetection.h
|
||||
@@ -1050,16 +1050,22 @@
|
||||
# endif // !_HAS_CONSTEXPR
|
||||
# endif // !__GLIBCXX__ && !_LIBCPP_VERSION
|
||||
# endif // Q_OS_QNX
|
||||
-# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \
|
||||
- && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
|
||||
+# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC)
|
||||
+# if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
|
||||
// Apple has not updated libstdc++ since 2007, which means it does not have
|
||||
// <initializer_list> or std::move. Let's disable these features
|
||||
-# undef Q_COMPILER_INITIALIZER_LISTS
|
||||
-# undef Q_COMPILER_RVALUE_REFS
|
||||
-# undef Q_COMPILER_REF_QUALIFIERS
|
||||
+# undef Q_COMPILER_INITIALIZER_LISTS
|
||||
+# undef Q_COMPILER_RVALUE_REFS
|
||||
+# undef Q_COMPILER_REF_QUALIFIERS
|
||||
// Also disable <atomic>, since it's clearly not there
|
||||
-# undef Q_COMPILER_ATOMICS
|
||||
-# endif
|
||||
+# undef Q_COMPILER_ATOMICS
|
||||
+# endif
|
||||
+# if defined(__cpp_lib_memory_resource) \
|
||||
+ && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 140000) \
|
||||
+ || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000))
|
||||
+# undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17
|
||||
+# endif
|
||||
+# endif // (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC)
|
||||
# if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500
|
||||
// ICC 15.x and 16.0 have their own implementation of std::atomic, which is activated when in Clang mode
|
||||
// (probably because libc++'s <atomic> on OS X failed to compile), but they're missing some
|
||||
--- a/src/corelib/tools/qduplicatetracker_p.h
|
||||
+++ b/src/corelib/tools/qduplicatetracker_p.h
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
#include <qglobal.h>
|
||||
|
||||
-#if QT_HAS_INCLUDE(<memory_resource>) && __cplusplus > 201402L
|
||||
+#if defined(__cpp_lib_memory_resource) && __cplusplus > 201402L
|
||||
# include <unordered_set>
|
||||
# include <memory_resource>
|
||||
#else
|
||||
@@ -0,0 +1,43 @@
|
||||
--- a/src/corelib/global/qcompilerdetection.h
|
||||
+++ b/src/corelib/global/qcompilerdetection.h
|
||||
@@ -1055,16 +1055,22 @@
|
||||
# endif // !_HAS_CONSTEXPR
|
||||
# endif // !__GLIBCXX__ && !_LIBCPP_VERSION
|
||||
# endif // Q_OS_QNX
|
||||
-# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \
|
||||
- && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
|
||||
+# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC)
|
||||
+# if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
|
||||
// Apple has not updated libstdc++ since 2007, which means it does not have
|
||||
// <initializer_list> or std::move. Let's disable these features
|
||||
-# undef Q_COMPILER_INITIALIZER_LISTS
|
||||
-# undef Q_COMPILER_RVALUE_REFS
|
||||
-# undef Q_COMPILER_REF_QUALIFIERS
|
||||
+# undef Q_COMPILER_INITIALIZER_LISTS
|
||||
+# undef Q_COMPILER_RVALUE_REFS
|
||||
+# undef Q_COMPILER_REF_QUALIFIERS
|
||||
// Also disable <atomic>, since it's clearly not there
|
||||
-# undef Q_COMPILER_ATOMICS
|
||||
-# endif
|
||||
+# undef Q_COMPILER_ATOMICS
|
||||
+# endif
|
||||
+# if defined(__cpp_lib_memory_resource) \
|
||||
+ && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 140000) \
|
||||
+ || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000))
|
||||
+# undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17
|
||||
+# endif
|
||||
+# endif // (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC)
|
||||
# if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500
|
||||
// ICC 15.x and 16.0 have their own implementation of std::atomic, which is activated when in Clang mode
|
||||
// (probably because libc++'s <atomic> on OS X failed to compile), but they're missing some
|
||||
--- a/src/corelib/tools/qduplicatetracker_p.h
|
||||
+++ b/src/corelib/tools/qduplicatetracker_p.h
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
#include <qglobal.h>
|
||||
|
||||
-#if QT_HAS_INCLUDE(<memory_resource>) && __cplusplus > 201402L
|
||||
+#if defined(__cpp_lib_memory_resource) && __cplusplus > 201402L
|
||||
# include <unordered_set>
|
||||
# include <memory_resource>
|
||||
#else
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/chromium/base/strings/utf_string_conversions.cc b/chromium/base/strings/utf_string_conversions.cc
|
||||
index 12ed1f3e0..004ac6855 100644
|
||||
--- a/chromium/base/strings/utf_string_conversions.cc
|
||||
+++ b/chromium/base/strings/utf_string_conversions.cc
|
||||
@@ -15,7 +15,7 @@
|
||||
#include "base/third_party/icu/icu_utf.h"
|
||||
#include "build/build_config.h"
|
||||
|
||||
-#if defined(OS_MAC)
|
||||
+#if defined(OS_MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 120300
|
||||
namespace std {
|
||||
inline namespace __1 {
|
||||
template class basic_string<base::char16, base::string16_internals::string16_char_traits>;
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp
|
||||
index c7dc8b38e..d9e3709b1 100644
|
||||
--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp
|
||||
+++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp
|
||||
@@ -3,6 +3,8 @@
|
||||
#include <typeinfo>
|
||||
#include <type_traits>
|
||||
#include <stdexcept>
|
||||
+#include <utility>
|
||||
+
|
||||
namespace mbgl {
|
||||
namespace util {
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf
|
||||
index 306e58db1..a42059e82 100644
|
||||
--- a/mkspecs/features/gn_generator.prf
|
||||
+++ b/mkspecs/features/gn_generator.prf
|
||||
@@ -166,7 +166,7 @@ for (flag, GN_FLAGS): GN_CONTENTS += " \"$$flag\","
|
||||
unix:!macos: GN_CONTENTS += " \"-Wl,-rpath=$${rpath}\","
|
||||
}
|
||||
}
|
||||
-!isEmpty(QMAKE_RPATHLINKDIR): GN_CONTENTS += " \"-Wl,-rpath-link=$${QMAKE_RPATHLINKDIR}\","
|
||||
+!isEmpty(QMAKE_LFLAGS_RPATHLINK):!isEmpty(QMAKE_RPATHLINKDIR): GN_CONTENTS += " \"-Wl,-rpath-link=$${QMAKE_RPATHLINKDIR}\","
|
||||
GN_CONTENTS += " ]"
|
||||
|
||||
GN_CONTENTS += " lib_dirs = ["
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git a/chromium/content/public/browser/BUILD.gn b/chromium/content/public/browser/BUILD.gn
|
||||
index 7cf82a4..0e0dda2 100644
|
||||
--- a/chromium/content/public/browser/BUILD.gn
|
||||
+++ b/chromium/content/public/browser/BUILD.gn
|
||||
@@ -469,6 +469,7 @@ jumbo_source_set("browser_sources") {
|
||||
"//build:chromeos_buildflags",
|
||||
"//cc",
|
||||
"//components/viz/host",
|
||||
+ "//components/spellcheck:buildflags",
|
||||
"//content/browser", # Must not be public_deps!
|
||||
"//device/fido",
|
||||
"//gpu",
|
||||
@@ -0,0 +1,43 @@
|
||||
--- a/src/corelib/global/qcompilerdetection.h
|
||||
+++ b/src/corelib/global/qcompilerdetection.h
|
||||
@@ -1041,16 +1041,22 @@
|
||||
# endif // !_HAS_CONSTEXPR
|
||||
# endif // !__GLIBCXX__ && !_LIBCPP_VERSION
|
||||
# endif // Q_OS_QNX
|
||||
-# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \
|
||||
- && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
|
||||
+# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC)
|
||||
+# if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
|
||||
// Apple has not updated libstdc++ since 2007, which means it does not have
|
||||
// <initializer_list> or std::move. Let's disable these features
|
||||
-# undef Q_COMPILER_INITIALIZER_LISTS
|
||||
-# undef Q_COMPILER_RVALUE_REFS
|
||||
-# undef Q_COMPILER_REF_QUALIFIERS
|
||||
+# undef Q_COMPILER_INITIALIZER_LISTS
|
||||
+# undef Q_COMPILER_RVALUE_REFS
|
||||
+# undef Q_COMPILER_REF_QUALIFIERS
|
||||
// Also disable <atomic>, since it's clearly not there
|
||||
-# undef Q_COMPILER_ATOMICS
|
||||
-# endif
|
||||
+# undef Q_COMPILER_ATOMICS
|
||||
+# endif
|
||||
+# if defined(__cpp_lib_memory_resource) \
|
||||
+ && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 140000) \
|
||||
+ || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000))
|
||||
+# undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17
|
||||
+# endif
|
||||
+# endif // (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC)
|
||||
# if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500
|
||||
// ICC 15.x and 16.0 have their own implementation of std::atomic, which is activated when in Clang mode
|
||||
// (probably because libc++'s <atomic> on OS X failed to compile), but they're missing some
|
||||
--- a/src/corelib/tools/qduplicatetracker_p.h
|
||||
+++ b/src/corelib/tools/qduplicatetracker_p.h
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
#include <qglobal.h>
|
||||
|
||||
-#if QT_HAS_INCLUDE(<memory_resource>) && __cplusplus > 201402L
|
||||
+#if defined(__cpp_lib_memory_resource) && __cplusplus > 201402L
|
||||
# include <unordered_set>
|
||||
# include <memory_resource>
|
||||
#else
|
||||
@@ -0,0 +1,26 @@
|
||||
--- a/mkspecs/features/toolchain.prf
|
||||
+++ b/mkspecs/features/toolchain.prf
|
||||
@@ -288,9 +288,12 @@ isEmpty($${target_prefix}.INCDIRS) {
|
||||
}
|
||||
}
|
||||
}
|
||||
- isEmpty(QMAKE_DEFAULT_LIBDIRS)|isEmpty(QMAKE_DEFAULT_INCDIRS): \
|
||||
+ isEmpty(QMAKE_DEFAULT_INCDIRS): \
|
||||
!integrity: \
|
||||
- error("failed to parse default search paths from compiler output")
|
||||
+ error("failed to parse default include paths from compiler output")
|
||||
+ isEmpty(QMAKE_DEFAULT_LIBDIRS): \
|
||||
+ !integrity:!darwin: \
|
||||
+ error("failed to parse default library paths from compiler output")
|
||||
QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS)
|
||||
} else: ghs {
|
||||
cmd = $$QMAKE_CXX $$QMAKE_CXXFLAGS -$${LITERAL_HASH} -o /tmp/fake_output /tmp/fake_input.cpp
|
||||
@@ -412,7 +415,7 @@ isEmpty($${target_prefix}.INCDIRS) {
|
||||
QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP)
|
||||
}
|
||||
|
||||
- unix:if(!cross_compile|host_build) {
|
||||
+ unix:!darwin:if(!cross_compile|host_build) {
|
||||
isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include
|
||||
isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib
|
||||
}
|
||||
@@ -0,0 +1,101 @@
|
||||
From 851cd7c7a079fa5da63770c49724036e8338e813 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Klocek <michal.klocek@qt.io>
|
||||
Date: Wed, 20 Sep 2023 07:45:29 +0200
|
||||
Subject: [PATCH] Fix errors and warnings for perfetto
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=utf8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
It seems newest msvc compiler does not like perfetto circualar queue
|
||||
const iterator, which ends in issues with std::swap of std::sort.
|
||||
Make sure it is non const.
|
||||
|
||||
Fix warnings.
|
||||
|
||||
Deals with: "error C2672: 'swap': no matching overloaded function
|
||||
found."
|
||||
|
||||
Fixes: QTBUG-117073
|
||||
Change-Id: I02901e61a1bb8863d72ca02a0ccd841e54309d6e
|
||||
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/505412
|
||||
Reviewed-by: Martin Negyokru <negyokru@inf.u-szeged.hu>
|
||||
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
|
||||
---
|
||||
.../perfetto/include/perfetto/ext/base/circular_queue.h | 9 ++-------
|
||||
.../third_party/perfetto/src/trace_processor/storage/metadata.h | 2 ++
|
||||
.../third_party/perfetto/src/trace_processor/storage/stats.h | 2 ++
|
||||
.../perfetto/src/trace_processor/tables/macros_internal.h | 2 ++
|
||||
4 files changed, 8 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h b/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
|
||||
index 18ca7702614..ec46e69f817 100644
|
||||
--- a/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
|
||||
+++ b/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
|
||||
@@ -67,19 +67,14 @@ class CircularQueue {
|
||||
ignore_result(generation);
|
||||
}
|
||||
|
||||
- T* operator->() {
|
||||
+ T* operator->() const {
|
||||
#if PERFETTO_DCHECK_IS_ON()
|
||||
PERFETTO_DCHECK(generation_ == queue_->generation());
|
||||
#endif
|
||||
return queue_->Get(pos_);
|
||||
}
|
||||
|
||||
- const T* operator->() const {
|
||||
- return const_cast<CircularQueue<T>::Iterator*>(this)->operator->();
|
||||
- }
|
||||
-
|
||||
- T& operator*() { return *(operator->()); }
|
||||
- const T& operator*() const { return *(operator->()); }
|
||||
+ T& operator*() const { return *(operator->()); }
|
||||
|
||||
value_type& operator[](difference_type i) { return *(*this + i); }
|
||||
|
||||
diff --git a/chromium/third_party/perfetto/src/trace_processor/storage/metadata.h b/chromium/third_party/perfetto/src/trace_processor/storage/metadata.h
|
||||
index 4796ae4edcd..30e534b216b 100644
|
||||
--- a/chromium/third_party/perfetto/src/trace_processor/storage/metadata.h
|
||||
+++ b/chromium/third_party/perfetto/src/trace_processor/storage/metadata.h
|
||||
@@ -59,8 +59,10 @@ namespace metadata {
|
||||
F(kMulti, "multi")
|
||||
// clang-format
|
||||
|
||||
+#if PERFETTO_BUILDFLAG(PERFETTO_COMPILER_GCC)
|
||||
// Ignore GCC warning about a missing argument for a variadic macro parameter.
|
||||
#pragma GCC system_header
|
||||
+#endif
|
||||
|
||||
#define PERFETTO_TP_META_TYPE_ENUM(varname, ...) varname
|
||||
enum class KeyType : size_t {
|
||||
diff --git a/chromium/third_party/perfetto/src/trace_processor/storage/stats.h b/chromium/third_party/perfetto/src/trace_processor/storage/stats.h
|
||||
index 7f14803244e..30b56c62544 100644
|
||||
--- a/chromium/third_party/perfetto/src/trace_processor/storage/stats.h
|
||||
+++ b/chromium/third_party/perfetto/src/trace_processor/storage/stats.h
|
||||
@@ -189,7 +189,9 @@ enum Source {
|
||||
};
|
||||
|
||||
// Ignore GCC warning about a missing argument for a variadic macro parameter.
|
||||
+#if PERFETTO_BUILDFLAG(PERFETTO_COMPILER_GCC)
|
||||
#pragma GCC system_header
|
||||
+#endif
|
||||
|
||||
// Declares an enum of literals (one for each stat). The enum values of each
|
||||
// literal corresponds to the string index in the arrays below.
|
||||
diff --git a/chromium/third_party/perfetto/src/trace_processor/tables/macros_internal.h b/chromium/third_party/perfetto/src/trace_processor/tables/macros_internal.h
|
||||
index 875efd62e0d..1ca5068cc32 100644
|
||||
--- a/chromium/third_party/perfetto/src/trace_processor/tables/macros_internal.h
|
||||
+++ b/chromium/third_party/perfetto/src/trace_processor/tables/macros_internal.h
|
||||
@@ -140,7 +140,9 @@ class MacroTable : public Table {
|
||||
} // namespace macros_internal
|
||||
|
||||
// Ignore GCC warning about a missing argument for a variadic macro parameter.
|
||||
+#if PERFETTO_BUILDFLAG(PERFETTO_COMPILER_GCC)
|
||||
#pragma GCC system_header
|
||||
+#endif
|
||||
|
||||
// Basic helper macros.
|
||||
#define PERFETTO_TP_NOOP(...)
|
||||
--
|
||||
2.16.3
|
||||
|
||||
29
recipes/qt/5.x.x/patches/aa2a39dea5.diff
Normal file
29
recipes/qt/5.x.x/patches/aa2a39dea5.diff
Normal file
@@ -0,0 +1,29 @@
|
||||
From aa2a39dea5918c63045310b0d2a7e34ce9934e0c Mon Sep 17 00:00:00 2001
|
||||
From: Eric Lemanissier <eric.lemanissier@gmail.com>
|
||||
Date: Tue, 26 Nov 2019 12:47:47 +0100
|
||||
Subject: [PATCH] add inline source detection to glib
|
||||
|
||||
this allows to use static version of glib (pkg-config only works with shared libraries)
|
||||
|
||||
Change-Id: If9b0054985b87b8da43269425b32c2e4ffb65f5a
|
||||
---
|
||||
src/corelib/configure.json | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
|
||||
index ae360239c6..998687dc4e 100644
|
||||
--- a/src/corelib/configure.json
|
||||
+++ b/src/corelib/configure.json
|
||||
@@ -45,7 +45,8 @@
|
||||
},
|
||||
"headers": "glib.h",
|
||||
"sources": [
|
||||
- { "type": "pkgConfig", "args": "glib-2.0 gthread-2.0" }
|
||||
+ { "type": "pkgConfig", "args": "glib-2.0 gthread-2.0" },
|
||||
+ "-lgthread-2.0 -lglib-2.0"
|
||||
]
|
||||
},
|
||||
"posix_iconv": {
|
||||
--
|
||||
2.23.0.windows.1
|
||||
|
||||
19
recipes/qt/5.x.x/patches/android-backtrace.diff
Normal file
19
recipes/qt/5.x.x/patches/android-backtrace.diff
Normal file
@@ -0,0 +1,19 @@
|
||||
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
|
||||
index 89f49324c..dedf78fe5 100644
|
||||
--- a/src/corelib/global/qlogging.cpp
|
||||
+++ b/src/corelib/global/qlogging.cpp
|
||||
@@ -107,7 +107,13 @@
|
||||
# define QLOGGING_HAVE_BACKTRACE
|
||||
# endif
|
||||
# elif (defined(__GLIBC__) && defined(__GLIBCXX__)) || (__has_include(<cxxabi.h>) && __has_include(<execinfo.h>))
|
||||
-# define QLOGGING_HAVE_BACKTRACE
|
||||
+# ifdef __ANDROID_API__
|
||||
+# if __ANDROID_API__ >= 33
|
||||
+# define QLOGGING_HAVE_BACKTRACE
|
||||
+# endif
|
||||
+# else
|
||||
+# define QLOGGING_HAVE_BACKTRACE
|
||||
+# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
27
recipes/qt/5.x.x/patches/android-new-ndk.diff
Normal file
27
recipes/qt/5.x.x/patches/android-new-ndk.diff
Normal file
@@ -0,0 +1,27 @@
|
||||
From 49f62e8c5a8aef4c0b7fd6867a30e653d2f5dd98 Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Edelev <alexey.edelev@qt.io>
|
||||
Date: Mon, 21 Nov 2022 15:03:17 +0100
|
||||
Subject: [PATCH] Remove QMAKE_RANLIB and QMAKE_LINK_SHLIB from android/default_pre.prf
|
||||
|
||||
The values should come from android-clang mkspecs. The hardcoded
|
||||
values don't work correctly with recent Android NDKs.
|
||||
|
||||
Pick-to: 6.4 6.2 5.15
|
||||
Fixes: QTBUG-108662
|
||||
Change-Id: Ie153a50ee0c49bd4f0704b588a4e2c87a05c1063
|
||||
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
|
||||
---
|
||||
|
||||
diff --git a/mkspecs/features/android/default_pre.prf b/mkspecs/features/android/default_pre.prf
|
||||
index 9f90dcb..2328b72 100644
|
||||
--- a/mkspecs/features/android/default_pre.prf
|
||||
+++ b/mkspecs/features/android/default_pre.prf
|
||||
@@ -76,8 +76,6 @@
|
||||
else: equals(QT_ARCH, arm64-v8a): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/aarch64-linux-android-
|
||||
else: CROSS_COMPILE = $$NDK_LLVM_PATH/bin/arm-linux-androideabi-
|
||||
|
||||
-QMAKE_RANLIB = $${CROSS_COMPILE}ranlib
|
||||
-QMAKE_LINK_SHLIB = $$QMAKE_LINK
|
||||
QMAKE_LFLAGS =
|
||||
|
||||
QMAKE_LIBS_PRIVATE = -llog -lz -lm -ldl -lc
|
||||
13
recipes/qt/5.x.x/patches/android-openssl.diff
Normal file
13
recipes/qt/5.x.x/patches/android-openssl.diff
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
|
||||
index 230c45c26..d7527949e 100644
|
||||
--- a/src/network/ssl/ssl.pri
|
||||
+++ b/src/network/ssl/ssl.pri
|
||||
@@ -117,7 +117,7 @@ qtConfig(ssl) {
|
||||
|
||||
qtConfig(openssl-linked): {
|
||||
android {
|
||||
- build_pass|single_android_abi: LIBS_PRIVATE += -lssl_$${QT_ARCH} -lcrypto_$${QT_ARCH}
|
||||
+ build_pass|single_android_abi: LIBS_PRIVATE += -lssl -lcrypto
|
||||
} else: QMAKE_USE_FOR_PRIVATE += openssl
|
||||
} else: \
|
||||
QMAKE_USE_FOR_PRIVATE += openssl/nolink
|
||||
42
recipes/qt/5.x.x/patches/c72097e.diff
Normal file
42
recipes/qt/5.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/tools/gn/ninja_action_target_writer.cc | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/src/3rdparty/gn/tools/gn/ninja_action_target_writer.cc b/src/3rdparty/gn/tools/gn/ninja_action_target_writer.cc
|
||||
index a5bc6cd..5cefbfe 100644
|
||||
--- a/src/3rdparty/gn/tools/gn/ninja_action_target_writer.cc
|
||||
+++ b/src/3rdparty/gn/tools/gn/ninja_action_target_writer.cc
|
||||
@@ -119,9 +119,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.
|
||||
@@ -0,0 +1,10 @@
|
||||
diff --git a/chromium/third_party/skia/src/utils/SkParseColor.cpp b/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
||||
index 7260365b2c6..96f46dd67f9 100644
|
||||
--- a/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
||||
+++ b/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
||||
@@ -9,3 +0,5 @@
|
||||
#include "include/utils/SkParse.h"
|
||||
|
||||
+#include <algorithm> // std::lower_bound
|
||||
+
|
||||
static constexpr const char* gColorNames[] = {
|
||||
46
recipes/qt/5.x.x/patches/chromium-v8-missing-constexpr.patch
Normal file
46
recipes/qt/5.x.x/patches/chromium-v8-missing-constexpr.patch
Normal file
@@ -0,0 +1,46 @@
|
||||
From a5cea1bfc38ceafc74f4baddd6ab94ea13757ef8 Mon Sep 17 00:00:00 2001
|
||||
From: Lei Zhang <thestig@chromium.org>
|
||||
Date: Fri, 21 May 2021 10:55:53 -0700
|
||||
Subject: [PATCH] Mark Node::opcode() and Operator::opcode() as constexpr.
|
||||
|
||||
Without the explicit constexpr keyword, Clang seems to be able to treat
|
||||
these methods as constexpr, whereas MSVC will not.
|
||||
|
||||
Bug: v8:11760
|
||||
Change-Id: I9f6492f38fb50dcaf7a4f09da0bd79c0da6a50eb
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2912916
|
||||
Reviewed-by: Clemens Backes <clemensb@chromium.org>
|
||||
Reviewed-by: Maya Lekova <mslekova@chromium.org>
|
||||
Commit-Queue: Lei Zhang <thestig@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/master@{#74791}
|
||||
---
|
||||
src/compiler/node.h | 2 +-
|
||||
src/compiler/operator.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/compiler/node.h b/src/compiler/node.h
|
||||
index 37b45c403f1..57d49fe1ac0 100644
|
||||
--- a/src/compiler/node.h
|
||||
+++ b/src/compiler/node.h
|
||||
@@ -50,7 +50,7 @@ class V8_EXPORT_PRIVATE Node final {
|
||||
|
||||
const Operator* op() const { return op_; }
|
||||
|
||||
- IrOpcode::Value opcode() const {
|
||||
+ constexpr IrOpcode::Value opcode() const {
|
||||
DCHECK_GE(IrOpcode::kLast, op_->opcode());
|
||||
return static_cast<IrOpcode::Value>(op_->opcode());
|
||||
}
|
||||
diff --git a/src/compiler/operator.h b/src/compiler/operator.h
|
||||
index 4206e753f1e..f641394eb1f 100644
|
||||
--- a/src/compiler/operator.h
|
||||
+++ b/src/compiler/operator.h
|
||||
@@ -69,7 +69,7 @@ class V8_EXPORT_PRIVATE Operator : public NON_EXPORTED_BASE(ZoneObject) {
|
||||
// A small integer unique to all instances of a particular kind of operator,
|
||||
// useful for quick matching for specific kinds of operators. For fast access
|
||||
// the opcode is stored directly in the operator object.
|
||||
- Opcode opcode() const { return opcode_; }
|
||||
+ constexpr Opcode opcode() const { return opcode_; }
|
||||
|
||||
// Returns a constant string representing the mnemonic of the operator,
|
||||
// without the static parameters. Useful for debugging.
|
||||
64
recipes/qt/5.x.x/patches/ffmpeg-x86-optimization.patch
Normal file
64
recipes/qt/5.x.x/patches/ffmpeg-x86-optimization.patch
Normal file
@@ -0,0 +1,64 @@
|
||||
Description: avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
|
||||
Fixes assembling with gas from binutils >= 2.41.
|
||||
Origin: upstream, https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/effadce6c756247e
|
||||
Bug: https://bugs.debian.org/1038132
|
||||
Last-Update: 2023-07-21
|
||||
|
||||
--- a/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
|
||||
+++ b/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
|
||||
@@ -35,12 +35,20 @@
|
||||
static av_always_inline av_const int MULL(int a, int b, unsigned shift)
|
||||
{
|
||||
int rt, dummy;
|
||||
+ if (__builtin_constant_p(shift))
|
||||
__asm__ (
|
||||
"imull %3 \n\t"
|
||||
"shrdl %4, %%edx, %%eax \n\t"
|
||||
:"=a"(rt), "=d"(dummy)
|
||||
- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
|
||||
+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
|
||||
);
|
||||
+ else
|
||||
+ __asm__ (
|
||||
+ "imull %3 \n\t"
|
||||
+ "shrdl %4, %%edx, %%eax \n\t"
|
||||
+ :"=a"(rt), "=d"(dummy)
|
||||
+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
|
||||
+ );
|
||||
return rt;
|
||||
}
|
||||
|
||||
@@ -113,19 +121,31 @@ __asm__ volatile(\
|
||||
// avoid +32 for shift optimization (gcc should do that ...)
|
||||
#define NEG_SSR32 NEG_SSR32
|
||||
static inline int32_t NEG_SSR32( int32_t a, int8_t s){
|
||||
+ if (__builtin_constant_p(s))
|
||||
__asm__ ("sarl %1, %0\n\t"
|
||||
: "+r" (a)
|
||||
- : "ic" ((uint8_t)(-s))
|
||||
+ : "i" (-s & 0x1F)
|
||||
);
|
||||
+ else
|
||||
+ __asm__ ("sarl %1, %0\n\t"
|
||||
+ : "+r" (a)
|
||||
+ : "c" ((uint8_t)(-s))
|
||||
+ );
|
||||
return a;
|
||||
}
|
||||
|
||||
#define NEG_USR32 NEG_USR32
|
||||
static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
|
||||
+ if (__builtin_constant_p(s))
|
||||
__asm__ ("shrl %1, %0\n\t"
|
||||
: "+r" (a)
|
||||
- : "ic" ((uint8_t)(-s))
|
||||
+ : "i" (-s & 0x1F)
|
||||
);
|
||||
+ else
|
||||
+ __asm__ ("shrl %1, %0\n\t"
|
||||
+ : "+r" (a)
|
||||
+ : "c" ((uint8_t)(-s))
|
||||
+ );
|
||||
return a;
|
||||
}
|
||||
|
||||
66
recipes/qt/5.x.x/patches/fix-macdeployqt.diff
Normal file
66
recipes/qt/5.x.x/patches/fix-macdeployqt.diff
Normal file
@@ -0,0 +1,66 @@
|
||||
From 03abcbabbd4caa11048d19d95b23f165cd7a5361 Mon Sep 17 00:00:00 2001
|
||||
From: Seth Parker <csparker247@gmail.com>
|
||||
Date: Wed, 31 Mar 2021 15:34:10 -0400
|
||||
Subject: [PATCH] macdeployqt: Fix plugin resolution bugs for non-standard
|
||||
installs
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Uses QLibraryInfo to resolve plugins at installed locations.
|
||||
|
||||
[ChangeLog][macOS][macdeployqt] Uses QLibraryInfo to resolve plugins at install locations.
|
||||
|
||||
Fixes: QTBUG-91644
|
||||
Change-Id: Ie309061024abd7a58ea62d707716342c99897c26
|
||||
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
||||
---
|
||||
src/macdeployqt/macdeployqt/main.cpp | 30 ++++++++++++++++++++++------
|
||||
1 file changed, 24 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/macdeployqt/macdeployqt/main.cpp b/src/macdeployqt/macdeployqt/main.cpp
|
||||
index 8914e835b..628a71378 100644
|
||||
--- a/src/macdeployqt/macdeployqt/main.cpp
|
||||
+++ b/src/macdeployqt/macdeployqt/main.cpp
|
||||
@@ -27,6 +27,7 @@
|
||||
****************************************************************************/
|
||||
#include <QCoreApplication>
|
||||
#include <QDir>
|
||||
+#include <QLibraryInfo>
|
||||
|
||||
#include "../shared/shared.h"
|
||||
|
||||
@@ -236,10 +237,28 @@ int main(int argc, char **argv)
|
||||
}
|
||||
|
||||
- if (plugins && !deploymentInfo.qtPath.isEmpty()) {
|
||||
- deploymentInfo.pluginPath = deploymentInfo.qtPath + "/plugins";
|
||||
- LogNormal();
|
||||
- deployPlugins(appBundlePath, deploymentInfo, useDebugLibs);
|
||||
- createQtConf(appBundlePath);
|
||||
+ // Handle plugins
|
||||
+ if (plugins) {
|
||||
+ // Set the plugins search directory
|
||||
+ deploymentInfo.pluginPath = QLibraryInfo::location(QLibraryInfo::PluginsPath);
|
||||
+
|
||||
+ // Sanity checks
|
||||
+ if (deploymentInfo.pluginPath.isEmpty()) {
|
||||
+ LogError() << "Missing Qt plugins path\n";
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
+ if (!QDir(deploymentInfo.pluginPath).exists()) {
|
||||
+ LogError() << "Plugins path does not exist" << deploymentInfo.pluginPath << "\n";
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
+ // Deploy plugins
|
||||
+ Q_ASSERT(!deploymentInfo.pluginPath.isEmpty());
|
||||
+ if (!deploymentInfo.pluginPath.isEmpty()) {
|
||||
+ LogNormal();
|
||||
+ deployPlugins(appBundlePath, deploymentInfo, useDebugLibs);
|
||||
+ createQtConf(appBundlePath);
|
||||
+ }
|
||||
}
|
||||
|
||||
if (runStripEnabled)
|
||||
45
recipes/qt/5.x.x/patches/qtconnectivity-1-fixes.patch
Normal file
45
recipes/qt/5.x.x/patches/qtconnectivity-1-fixes.patch
Normal file
@@ -0,0 +1,45 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Mon, 4 Nov 2024 15:34:31 +0100
|
||||
Subject: [PATCH 1/1] fix
|
||||
|
||||
|
||||
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_win.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_win.cpp
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/bluetooth/qbluetoothservicediscoveryagent_win.cpp
|
||||
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_win.cpp
|
||||
@@ -50,15 +50,7 @@
|
||||
#include <winsock2.h>
|
||||
#include <qt_windows.h>
|
||||
|
||||
-#if defined(Q_CC_MINGW)
|
||||
-// Workaround for MinGW headers declaring BluetoothSdpGetElementData incorrectly.
|
||||
-# define BluetoothSdpGetElementData _BluetoothSdpGetElementData_notok
|
||||
-# include <bluetoothapis.h>
|
||||
-# undef BluetoothSdpGetElementData
|
||||
- extern "C" DWORD WINAPI BluetoothSdpGetElementData(LPBYTE, ULONG, PSDP_ELEMENT_DATA);
|
||||
-#else
|
||||
-# include <bluetoothapis.h>
|
||||
-#endif
|
||||
+#include <bluetoothapis.h>
|
||||
|
||||
#include <ws2bth.h>
|
||||
#include <iostream>
|
||||
@@ -206,12 +198,7 @@ static QList<QVariant> spdContainerToVariantList(LPBYTE containerStream, ULONG c
|
||||
return sequence;
|
||||
}
|
||||
|
||||
-#if defined(Q_CC_MINGW)
|
||||
-# define SDP_CALLBACK
|
||||
-#else
|
||||
-# define SDP_CALLBACK QT_WIN_CALLBACK
|
||||
-#endif
|
||||
-static BOOL SDP_CALLBACK bluetoothSdpCallback(ULONG attributeId, LPBYTE valueStream, ULONG streamSize, LPVOID param)
|
||||
+static BOOL QT_WIN_CALLBACK bluetoothSdpCallback(ULONG attributeId, LPBYTE valueStream, ULONG streamSize, LPVOID param)
|
||||
{
|
||||
QBluetoothServiceInfo *result = static_cast<QBluetoothServiceInfo*>(param);
|
||||
|
||||
94
recipes/qt/5.x.x/patches/qtdeclarative-1-fixes.patch
Normal file
94
recipes/qt/5.x.x/patches/qtdeclarative-1-fixes.patch
Normal file
@@ -0,0 +1,94 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Fri, 20 Nov 2020 18:32:31 +0100
|
||||
Subject: [PATCH 1/2] Disable d3d12 requiring fxc.exe
|
||||
|
||||
* fxc.exe is not provided by WINE or mingw-w64 and hence not available
|
||||
in our build environment
|
||||
* The version from https://github.com/mozilla/fxc2 builds but it does
|
||||
not support all CLI options required by Qt's build system
|
||||
* The build error looks like this:
|
||||
```
|
||||
make[5]: Entering directory '/build/mingw-w64-qt5-declarative/src/qtdeclarative-everywhere-src-5.15.2/build-i686-w64-mingw32-shared/src/plugins/scenegraph/d3d12'
|
||||
fxc.exe /nologo /E VS_VertexColor /T vs_5_0 /Fh vs_vertexcolor.hlslh /build/mingw-w64-qt5-declarative/src/qtdeclarative-everywhere-src-5.15.2/src/plugins/scenegraph/d3d12/shaders/vertexcolor.hlsl
|
||||
make[5]: fxc.exe: No such file or directory
|
||||
make[5]: *** [Makefile.Release:233: vs_vertexcolor.hlslh] Error 127
|
||||
```
|
||||
taken from:
|
||||
https://aur.archlinux.org/cgit/aur.git/tree/0003-Disable-d3d12-requiring-fxc.exe.patch?h=mingw-w64-qt5-declarative
|
||||
|
||||
diff --git a/src/3rdparty/masm/yarr/Yarr.h b/src/3rdparty/masm/yarr/Yarr.h
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/3rdparty/masm/yarr/Yarr.h
|
||||
+++ b/src/3rdparty/masm/yarr/Yarr.h
|
||||
@@ -27,6 +27,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <limits>
|
||||
+
|
||||
#include <limits.h>
|
||||
#include <limits>
|
||||
#include "YarrErrorCode.h"
|
||||
diff --git a/src/plugins/scenegraph/scenegraph.pro b/src/plugins/scenegraph/scenegraph.pro
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/plugins/scenegraph/scenegraph.pro
|
||||
+++ b/src/plugins/scenegraph/scenegraph.pro
|
||||
@@ -1,5 +1,4 @@
|
||||
TEMPLATE = subdirs
|
||||
QT_FOR_CONFIG += quick
|
||||
-qtConfig(d3d12): SUBDIRS += d3d12
|
||||
qtConfig(openvg): SUBDIRS += openvg
|
||||
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
Date: Wed, 19 Jun 2019 12:54:43 +0200
|
||||
Subject: [PATCH 2/2] Update hovered on disabled QQuickItems
|
||||
|
||||
Changes handling of hovered so that the property is still updated on
|
||||
disabled items, so that other items can bind to it. This is in
|
||||
particular useful for tooltips.
|
||||
|
||||
[ChangeLog][Behavior Changes] QQuickItem::hovered will now update even
|
||||
when the item is disabled.
|
||||
|
||||
Fixes: QTBUG-30801
|
||||
Pick-to: 6.0
|
||||
Change-Id: Id17298f657d7631b0e5019138ba33a7d5f863475
|
||||
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
||||
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
||||
|
||||
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/quick/items/qquickwindow.cpp
|
||||
+++ b/src/quick/items/qquickwindow.cpp
|
||||
@@ -2110,7 +2110,9 @@ bool QQuickWindowPrivate::deliverHoverEvent(QQuickItem *item, const QPointF &sce
|
||||
QList<QQuickItem *> children = itemPrivate->paintOrderChildItems();
|
||||
for (int ii = children.count() - 1; ii >= 0; --ii) {
|
||||
QQuickItem *child = children.at(ii);
|
||||
- if (!child->isVisible() || !child->isEnabled() || QQuickItemPrivate::get(child)->culled)
|
||||
+ if (!child->isVisible() || QQuickItemPrivate::get(child)->culled)
|
||||
+ continue;
|
||||
+ if (!child->isEnabled() && !QQuickItemPrivate::get(child)->subtreeHoverEnabled)
|
||||
continue;
|
||||
if (deliverHoverEvent(child, scenePos, lastScenePos, modifiers, timestamp, accepted))
|
||||
return true;
|
||||
diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
|
||||
index 1111111..2222222 100644
|
||||
--- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp
|
||||
+++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
|
||||
@@ -1657,7 +1657,7 @@ void tst_qquickitem::hoverEvent()
|
||||
sendMouseMove(window, inside);
|
||||
sendMouseMove(window, outside);
|
||||
|
||||
- const bool shouldReceiveHoverEvents = visible && enabled && acceptHoverEvents;
|
||||
+ const bool shouldReceiveHoverEvents = visible && acceptHoverEvents;
|
||||
if (shouldReceiveHoverEvents) {
|
||||
QCOMPARE(item->hoverEnterCount, 1);
|
||||
QCOMPARE(item->hoverMoveCount, 2);
|
||||
23
recipes/qt/5.x.x/patches/qtlocation-1.patch
Normal file
23
recipes/qt/5.x.x/patches/qtlocation-1.patch
Normal file
@@ -0,0 +1,23 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri, 2 Jun 2017 18:23:20 +0200
|
||||
Subject: [PATCH 1/1] disable mapboxgl for MXE
|
||||
|
||||
|
||||
diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/plugins/geoservices/geoservices.pro
|
||||
+++ b/src/plugins/geoservices/geoservices.pro
|
||||
@@ -12,7 +12,8 @@ qtConfig(geoservices_mapboxgl) {
|
||||
!exists(../../3rdparty/mapbox-gl-native/mapbox-gl-native.pro) {
|
||||
warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
|
||||
} else {
|
||||
- SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native
|
||||
- mapboxgl.depends = ../../3rdparty/mapbox-gl-native
|
||||
+# SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native
|
||||
+# mapboxgl.depends = ../../3rdparty/mapbox-gl-native
|
||||
+ message(MXE: mapboxgl disabled)
|
||||
}
|
||||
}
|
||||
22
recipes/qt/5.x.x/patches/qtmultimedia-1.patch
Normal file
22
recipes/qt/5.x.x/patches/qtmultimedia-1.patch
Normal file
@@ -0,0 +1,22 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
From 0000000000000000000000000000000000000000 Thu May 27 00:00:00 2021
|
||||
From: Adrian Jaekel <aj@elane2k.com>
|
||||
Date: Thu, 27 May 2021 14:03:20 +0200
|
||||
Subject: [PATCH 1/1] disable wmf plugin for MXE
|
||||
|
||||
|
||||
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/plugins/plugins.pro
|
||||
+++ b/src/plugins/plugins.pro
|
||||
@@ -35,7 +35,8 @@ win32:!winrt {
|
||||
windowsaudio
|
||||
|
||||
qtConfig(directshow): SUBDIRS += directshow
|
||||
- qtConfig(wmf): SUBDIRS += wmf
|
||||
+# qtConfig(wmf): SUBDIRS += wmf
|
||||
+ message(MXE: wmf disabled)
|
||||
}
|
||||
|
||||
|
||||
94
recipes/qt/5.x.x/patches/qttools-1-fixes.patch
Normal file
94
recipes/qt/5.x.x/patches/qttools-1-fixes.patch
Normal file
@@ -0,0 +1,94 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sun, 28 Apr 2019 23:07:09 +1000
|
||||
Subject: [PATCH 1/2] disable windeployqt (MXE specific)
|
||||
|
||||
|
||||
diff --git a/src/src.pro b/src/src.pro
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/src.pro
|
||||
+++ b/src/src.pro
|
||||
@@ -36,7 +36,7 @@ macos {
|
||||
|
||||
qtHaveModule(dbus): SUBDIRS += qdbus
|
||||
|
||||
-win32|winrt:SUBDIRS += windeployqt
|
||||
+#win32|winrt:SUBDIRS += windeployqt
|
||||
winrt:SUBDIRS += winrtrunner
|
||||
qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
|
||||
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Sun, 28 Apr 2019 23:12:41 +1000
|
||||
Subject: [PATCH 2/2] disable qdoc (MXE specific - requires libclang-devel)
|
||||
|
||||
|
||||
diff --git a/src/assistant/help/Qt5HelpConfigExtras.cmake.in b/src/assistant/help/Qt5HelpConfigExtras.cmake.in
|
||||
deleted file mode 100644
|
||||
index 1f7544b..0000000
|
||||
--- a/src/assistant/help/Qt5HelpConfigExtras.cmake.in
|
||||
+++ /dev/null
|
||||
@@ -1,41 +0,0 @@
|
||||
-
|
||||
-if (NOT TARGET Qt5::qcollectiongenerator)
|
||||
- add_executable(Qt5::qcollectiongenerator IMPORTED)
|
||||
-
|
||||
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ELSE
|
||||
- set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ENDIF
|
||||
- _qt5_Help_check_file_exists(${imported_location})
|
||||
-
|
||||
- set_target_properties(Qt5::qcollectiongenerator PROPERTIES
|
||||
- IMPORTED_LOCATION ${imported_location}
|
||||
- )
|
||||
-endif()
|
||||
-
|
||||
-if (NOT TARGET Qt5::qhelpgenerator)
|
||||
- add_executable(Qt5::qhelpgenerator IMPORTED)
|
||||
-
|
||||
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ELSE
|
||||
- set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ENDIF
|
||||
- _qt5_Help_check_file_exists(${imported_location})
|
||||
-
|
||||
- set_target_properties(Qt5::qhelpgenerator PROPERTIES
|
||||
- IMPORTED_LOCATION ${imported_location}
|
||||
- )
|
||||
-endif()
|
||||
-
|
||||
-# Create versionless tool targets.
|
||||
-foreach(__qt_tool qcollectiongenerator qhelpgenerator)
|
||||
- if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::${__qt_tool}
|
||||
- AND TARGET Qt5::${__qt_tool})
|
||||
- add_executable(Qt::${__qt_tool} IMPORTED)
|
||||
- get_target_property(__qt_imported_location Qt5::${__qt_tool} IMPORTED_LOCATION)
|
||||
- set_target_properties(Qt::${__qt_tool}
|
||||
- PROPERTIES IMPORTED_LOCATION \"${__qt_imported_location}\")
|
||||
- endif()
|
||||
-endforeach()
|
||||
diff --git a/src/src.pro b/src/src.pro
|
||||
index 1111111..2222222 100644
|
||||
--- a/src/src.pro
|
||||
+++ b/src/src.pro
|
||||
@@ -24,9 +24,9 @@ qtConfig(library) {
|
||||
!android|android_app: SUBDIRS += qtplugininfo
|
||||
}
|
||||
|
||||
-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
|
||||
-QT_FOR_CONFIG += qdoc-private
|
||||
-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
|
||||
+#include($$OUT_PWD/qdoc/qtqdoc-config.pri)
|
||||
+#QT_FOR_CONFIG += qdoc-private
|
||||
+#qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
|
||||
|
||||
!android|android_app: SUBDIRS += qtpaths
|
||||
|
||||
25
recipes/qt/5.x.x/patches/skia-cd397f3.diff
Normal file
25
recipes/qt/5.x.x/patches/skia-cd397f3.diff
Normal file
@@ -0,0 +1,25 @@
|
||||
From cd397f3c4738beb61cfd1c611544d096a6f4fa36 Mon Sep 17 00:00:00 2001
|
||||
From: Jordan Williams <jordan@jwillikers.com>
|
||||
Date: Tue, 26 Apr 2022 11:44:31 -0500
|
||||
Subject: [PATCH] Add missing include for std::begin and std::end in SkParseColor.cpp
|
||||
|
||||
Change-Id: I51f6766271cfcc2dff7fc30e3f7439c4580cbb6a
|
||||
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/533981
|
||||
Reviewed-by: Brian Salomon <bsalomon@google.com>
|
||||
Commit-Queue: Brian Salomon <bsalomon@google.com>
|
||||
---
|
||||
|
||||
# Trusted service accounts.
|
||||
Recipe roller SA <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
|
||||
diff --git a/src/utils/SkParseColor.cpp b/src/utils/SkParseColor.cpp
|
||||
index 3164650..0dc3497 100644
|
||||
--- a/src/utils/SkParseColor.cpp
|
||||
+++ b/src/utils/SkParseColor.cpp
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "include/utils/SkParse.h"
|
||||
|
||||
#include <algorithm> // std::lower_bound
|
||||
+#include <iterator>
|
||||
|
||||
static constexpr const char* gColorNames[] = {
|
||||
"aliceblue",
|
||||
326
recipes/qt/5.x.x/qtmodules5.15.10.conf
Normal file
326
recipes/qt/5.x.x/qtmodules5.15.10.conf
Normal file
@@ -0,0 +1,326 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.15
|
||||
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 = master
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.15
|
||||
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 "qtdocgallery"]
|
||||
depends = qtdeclarative
|
||||
path = qtdocgallery
|
||||
url = ../qtdocgallery.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.15
|
||||
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 = 5.15
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
326
recipes/qt/5.x.x/qtmodules5.15.11.conf
Normal file
326
recipes/qt/5.x.x/qtmodules5.15.11.conf
Normal file
@@ -0,0 +1,326 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.15
|
||||
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 = master
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.15
|
||||
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 "qtdocgallery"]
|
||||
depends = qtdeclarative
|
||||
path = qtdocgallery
|
||||
url = ../qtdocgallery.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.15
|
||||
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 = 5.15
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
326
recipes/qt/5.x.x/qtmodules5.15.12.conf
Normal file
326
recipes/qt/5.x.x/qtmodules5.15.12.conf
Normal file
@@ -0,0 +1,326 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.15
|
||||
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 = master
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.15
|
||||
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 "qtdocgallery"]
|
||||
depends = qtdeclarative
|
||||
path = qtdocgallery
|
||||
url = ../qtdocgallery.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.15
|
||||
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 = 5.15
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
326
recipes/qt/5.x.x/qtmodules5.15.13.conf
Normal file
326
recipes/qt/5.x.x/qtmodules5.15.13.conf
Normal file
@@ -0,0 +1,326 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.15
|
||||
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 = master
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.15
|
||||
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 "qtdocgallery"]
|
||||
depends = qtdeclarative
|
||||
path = qtdocgallery
|
||||
url = ../qtdocgallery.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.15
|
||||
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 = 5.15
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
326
recipes/qt/5.x.x/qtmodules5.15.14.conf
Normal file
326
recipes/qt/5.x.x/qtmodules5.15.14.conf
Normal file
@@ -0,0 +1,326 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.15
|
||||
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 = master
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.15
|
||||
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 "qtdocgallery"]
|
||||
depends = qtdeclarative
|
||||
path = qtdocgallery
|
||||
url = ../qtdocgallery.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.15
|
||||
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 = 5.15
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
326
recipes/qt/5.x.x/qtmodules5.15.16.conf
Normal file
326
recipes/qt/5.x.x/qtmodules5.15.16.conf
Normal file
@@ -0,0 +1,326 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.15
|
||||
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 = master
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.15
|
||||
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 "qtdocgallery"]
|
||||
depends = qtdeclarative
|
||||
path = qtdocgallery
|
||||
url = ../qtdocgallery.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.15
|
||||
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 = 5.15
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
326
recipes/qt/5.x.x/qtmodules5.15.9.conf
Normal file
326
recipes/qt/5.x.x/qtmodules5.15.9.conf
Normal file
@@ -0,0 +1,326 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.15
|
||||
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 = master
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.15
|
||||
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 "qtdocgallery"]
|
||||
depends = qtdeclarative
|
||||
path = qtdocgallery
|
||||
url = ../qtdocgallery.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.15
|
||||
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 = 5.15
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 5.15
|
||||
status = addon
|
||||
23
recipes/qt/5.x.x/test_v1_package/CMakeLists.txt
Normal file
23
recipes/qt/5.x.x/test_v1_package/CMakeLists.txt
Normal file
@@ -0,0 +1,23 @@
|
||||
cmake_minimum_required(VERSION 3.1.0)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
|
||||
project(test_package)
|
||||
|
||||
cmake_policy(SET CMP0020 NEW)
|
||||
|
||||
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
|
||||
conan_set_vs_runtime()
|
||||
conan_set_libcxx()
|
||||
conan_output_dirs_setup()
|
||||
|
||||
find_package(Qt5 COMPONENTS Core Network Sql Concurrent Xml REQUIRED CONFIG)
|
||||
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(SOURCES ../test_package/test_package.cpp ../test_package/greeter.h ../test_package/example.qrc)
|
||||
|
||||
add_executable(${PROJECT_NAME} ${SOURCES})
|
||||
|
||||
target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Network Qt5::Sql Qt5::Concurrent Qt5::Xml)
|
||||
134
recipes/qt/5.x.x/test_v1_package/conanfile.py
Normal file
134
recipes/qt/5.x.x/test_v1_package/conanfile.py
Normal file
@@ -0,0 +1,134 @@
|
||||
import os
|
||||
import shutil
|
||||
|
||||
from conan import ConanFile
|
||||
from conans import tools, Meson, RunEnvironment, CMake
|
||||
from conan.tools.build import cross_building
|
||||
from conan.tools.files import save
|
||||
from conan.errors import ConanInvalidConfiguration
|
||||
|
||||
|
||||
|
||||
class TestPackageConan(ConanFile):
|
||||
settings = "os", "compiler", "build_type", "arch"
|
||||
generators = "cmake", "cmake_find_package_multi", "qmake"
|
||||
|
||||
@property
|
||||
def _settings_build(self):
|
||||
return getattr(self, "settings_build", self.settings)
|
||||
|
||||
def build_requirements(self):
|
||||
if self._settings_build.os == "Windows" and self.settings.compiler == "Visual Studio":
|
||||
self.build_requires("jom/1.1.3")
|
||||
if self._meson_supported():
|
||||
self.build_requires("meson/1.1.1")
|
||||
|
||||
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 self.options["qt"].shared and\
|
||||
not cross_building(self) and\
|
||||
not tools.os_info.is_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
|
||||
tools.mkdir("qmake_folder")
|
||||
with tools.chdir("qmake_folder"):
|
||||
self.output.info("Building with qmake")
|
||||
|
||||
with tools.vcvars(self.settings) if self.settings.compiler == "Visual Studio" 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 += ['QMAKE_CC="' + value + '"',
|
||||
'QMAKE_LINK_C="' + value + '"',
|
||||
'QMAKE_LINK_C_SHLIB="' + value + '"']
|
||||
|
||||
value = _getenvpath('CXX')
|
||||
if value:
|
||||
args += ['QMAKE_CXX="' + value + '"',
|
||||
'QMAKE_LINK="' + value + '"',
|
||||
'QMAKE_LINK_SHLIB="' + value + '"']
|
||||
|
||||
self.run("qmake %s" % " ".join(args), run_environment=True)
|
||||
if tools.os_info.is_windows:
|
||||
if self.settings.compiler == "Visual Studio":
|
||||
self.run("jom", 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")
|
||||
tools.mkdir("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 ConanInvalidConfiguration:
|
||||
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.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 tools.os_info.is_macos:
|
||||
bin_path = os.path.join(bin_path, "test_package.app", "Contents", "MacOS")
|
||||
shutil.copy(os.path.join(self.generators_folder, "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(os.path.join(self.generators_folder, "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(os.path.join(self.generators_folder, "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/5.x.x/test_v1_package/meson.build
Normal file
6
recipes/qt/5.x.x/test_v1_package/meson.build
Normal file
@@ -0,0 +1,6 @@
|
||||
project('test_package', 'cpp')
|
||||
qt5 = import('qt5')
|
||||
qt5_dep = dependency('qt5', modules: ['Core', 'Network', 'Sql', 'Concurrent', 'Xml'])
|
||||
moc_files = qt5.preprocess(moc_headers : '../test_package/greeter.h', qresources : '../test_package/example.qrc')
|
||||
executable('test_package', '../test_package/test_package.cpp', moc_files,
|
||||
dependencies : qt5_dep)
|
||||
14
recipes/qt/5.x.x/test_v1_package/test_package.pro
Normal file
14
recipes/qt/5.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