mirror of
https://github.com/audacity/conan-recipes.git
synced 2025-12-09 19:44:51 -06:00
Adds Qt recipe
The recipe is based on the recipe from conan-central, but with a bug fixed in the recipe
This commit is contained in:
parent
7f63faea5b
commit
7c7ef9a32f
25
build.py
Normal file
25
build.py
Normal file
@ -0,0 +1,25 @@
|
||||
import os
|
||||
import re
|
||||
|
||||
import yaml
|
||||
from cpt.packager import ConanMultiPackager
|
||||
|
||||
def build_package(package):
|
||||
ref = re.compile(r'/|@').split(package)
|
||||
|
||||
root_package_dir = ref[0]
|
||||
|
||||
package_config = yaml.load(open(os.path.join(root_package_dir, "config.yml"), "r"))
|
||||
|
||||
versions = package_config["versions"]
|
||||
folder = versions[ref[1]]["folder"]
|
||||
|
||||
builder = ConanMultiPackager(reference=package, conanfile=os.path.join(root_package_dir, folder, "conanfile.py"), visual_runtimes=["MD", "MDd"], msvc_versions=["193"],cppstds=["17"])
|
||||
builder.add_common_builds()
|
||||
builder.run_builds()
|
||||
|
||||
print(builder)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
build_package("expat/2.3.0@audacity/stable")
|
||||
30
qt/5.x.x/conandata.yml
Normal file
30
qt/5.x.x/conandata.yml
Normal file
@ -0,0 +1,30 @@
|
||||
sources:
|
||||
"5.15.2":
|
||||
url:
|
||||
- "https://download.qt.io/archive/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.tar.xz"
|
||||
- "https://qt-mirror.dannhauer.de/archive/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.tar.xz"
|
||||
- "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.tar.xz"
|
||||
- "https://ftp.fau.de/qtproject/archive/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.tar.xz"
|
||||
sha256: "3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240"
|
||||
patches:
|
||||
"5.15.2":
|
||||
- patch_file: "patches/aa2a39dea5.diff"
|
||||
base_path: "qt5/qtbase"
|
||||
- patch_file: "patches/c72097e.diff"
|
||||
base_path: "qt5/qtwebengine"
|
||||
- patch_file: "patches/fix-macdeployqt.diff"
|
||||
base_path: "qt5/qttools"
|
||||
- patch_file: "patches/QTBUG-88625.diff"
|
||||
base_path: "qt5/qtwebengine"
|
||||
- patch_file: "patches/7371d3a.diff"
|
||||
base_path: "qt5/qtbase"
|
||||
- patch_file: "patches/QTBUG-90395.diff"
|
||||
base_path: "qt5/qtbase"
|
||||
- patch_file: "patches/declarative_missing_header.diff"
|
||||
base_path: "qt5/qtdeclarative"
|
||||
- patch_file: "patches/f830b86.diff"
|
||||
base_path: "qt5/qtwebengine/src/3rdparty"
|
||||
- patch_file: "patches/fix-gcc-11.diff"
|
||||
base_path: "qt5/qtwebengine/src/3rdparty"
|
||||
- patch_file: "patches/dece6f5.diff"
|
||||
base_path: "qt5/qtbase"
|
||||
1311
qt/5.x.x/conanfile.py
Normal file
1311
qt/5.x.x/conanfile.py
Normal file
File diff suppressed because it is too large
Load Diff
38
qt/5.x.x/patches/7371d3a.diff
Normal file
38
qt/5.x.x/patches/7371d3a.diff
Normal file
@ -0,0 +1,38 @@
|
||||
Parent: 30151e20 (Fix misidentification of some shearing QTransforms as only rotating)
|
||||
Author: Zhang Yu <zhangyub@uniontech.com>
|
||||
AuthorDate: 2020-11-17 21:05:39 +0800
|
||||
Commit: Zhang Yu <zhangyub@uniontech.com>
|
||||
CommitDate: 2020-11-18 07:41:48 +0000
|
||||
|
||||
Fix QGraphicsItem crash if click right button of mouse
|
||||
|
||||
In this case, the 'parent' is QGraphicsTextItem which isn't a object
|
||||
inheriting from QWidget. Converting QGraphicsTextItem to QWidget
|
||||
by static_cast and using it as QWidget leads to crash.
|
||||
|
||||
Fixes: QTBUG-88309
|
||||
Change-Id: I3c583f43125eb36841848434d1fa9a135b0e9f57
|
||||
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
||||
(cherry picked from commit 4df5f93018344f6cdc6cd5a08a084b1c61e0c076)
|
||||
|
||||
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
|
||||
index 40b8af6..e2a07c0 100644
|
||||
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
|
||||
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
|
||||
@@ -1942,10 +1942,14 @@
|
||||
if (!menu)
|
||||
return;
|
||||
menu->setAttribute(Qt::WA_DeleteOnClose);
|
||||
- if (auto *window = static_cast<QWidget *>(parent)->window()->windowHandle()) {
|
||||
- QMenuPrivate::get(menu)->topData()->initialScreenIndex =
|
||||
+
|
||||
+ if (auto *widget = qobject_cast<QWidget *>(parent)) {
|
||||
+ if (auto *window = widget->window()->windowHandle()) {
|
||||
+ QMenuPrivate::get(menu)->topData()->initialScreenIndex =
|
||||
QGuiApplication::screens().indexOf(window->screen());
|
||||
+ }
|
||||
}
|
||||
+
|
||||
menu->popup(screenPos);
|
||||
#endif
|
||||
}
|
||||
58
qt/5.x.x/patches/QTBUG-88625.diff
Normal file
58
qt/5.x.x/patches/QTBUG-88625.diff
Normal file
@ -0,0 +1,58 @@
|
||||
Fix compile errors in QtWebEngine when building with VS2019 >= 16.8.0 .
|
||||
See https://bugreports.qt.io/browse/QTBUG-88625 and
|
||||
https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/321741 .
|
||||
|
||||
diff -u -r a/src/3rdparty/chromium/third_party/angle/src/common/mathutil.cpp b/src/3rdparty/chromium/third_party/angle/src/common/mathutil.cpp
|
||||
--- a/src/3rdparty/chromium/third_party/angle/src/common/mathutil.cpp 2021-05-20 13:38:32.243947800 +0200
|
||||
+++ b/src/3rdparty/chromium/third_party/angle/src/common/mathutil.cpp 2021-05-20 12:25:30.392900700 +0200
|
||||
@@ -72,11 +72,11 @@
|
||||
const RGB9E5Data *inputData = reinterpret_cast<const RGB9E5Data *>(&input);
|
||||
|
||||
*red =
|
||||
- inputData->R * pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
|
||||
+ inputData->R * (float)pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
|
||||
*green =
|
||||
- inputData->G * pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
|
||||
+ inputData->G * (float)pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
|
||||
*blue =
|
||||
- inputData->B * pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
|
||||
+ inputData->B * (float)pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
|
||||
}
|
||||
|
||||
} // namespace gl
|
||||
diff -u -r a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h
|
||||
--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h 2020-11-07 02:22:36.000000000 +0100
|
||||
+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h 2021-05-20 13:39:42.890109500 +0200
|
||||
@@ -130,7 +130,7 @@
|
||||
// https://en.wikipedia.org/wiki/CIELAB_color_space#Forward_transformation.
|
||||
FloatPoint3D toXYZ(const FloatPoint3D& lab) const {
|
||||
auto invf = [](float x) {
|
||||
- return x > kSigma ? pow(x, 3) : 3 * kSigma2 * (x - 4.0f / 29.0f);
|
||||
+ return x > kSigma ? (float)pow(x, 3) : 3 * kSigma2 * (x - 4.0f / 29.0f);
|
||||
};
|
||||
|
||||
FloatPoint3D v = {clamp(lab.X(), 0.0f, 100.0f),
|
||||
diff -u -r a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/timestamped_trace_piece.h b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/timestamped_trace_piece.h
|
||||
--- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/timestamped_trace_piece.h 2020-11-07 02:22:36.000000000 +0100
|
||||
+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/timestamped_trace_piece.h 2021-05-20 13:41:08.983902900 +0200
|
||||
@@ -197,6 +197,20 @@
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
+
|
||||
+ #if PERFETTO_BUILDFLAG(PERFETTO_COMPILER_MSVC)
|
||||
+ TimestampedTracePiece& operator=(TimestampedTracePiece&& ttp) const
|
||||
+ {
|
||||
+ if (this != &ttp) {
|
||||
+ // First invoke the destructor and then invoke the move constructor
|
||||
+ // inline via placement-new to implement move-assignment.
|
||||
+ this->~TimestampedTracePiece();
|
||||
+ new (const_cast<TimestampedTracePiece*>(this)) TimestampedTracePiece(std::move(ttp));
|
||||
+ }
|
||||
+
|
||||
+ return const_cast<TimestampedTracePiece&>(*this);
|
||||
+ }
|
||||
+#endif // PERFETTO_BUILDFLAG(PERFETTO_COMPILER_MSVC)
|
||||
|
||||
~TimestampedTracePiece() {
|
||||
switch (type) {
|
||||
38
qt/5.x.x/patches/QTBUG-90395.diff
Normal file
38
qt/5.x.x/patches/QTBUG-90395.diff
Normal file
@ -0,0 +1,38 @@
|
||||
Description: include <limits> to fix some GCC 11 build issues
|
||||
Origin: upstream, commits:
|
||||
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
|
||||
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8
|
||||
Last-Update: 2021-01-26
|
||||
|
||||
--- a/src/corelib/global/qendian.h
|
||||
+++ b/src/corelib/global/qendian.h
|
||||
@@ -44,6 +44,8 @@
|
||||
#include <QtCore/qfloat16.h>
|
||||
#include <QtCore/qglobal.h>
|
||||
|
||||
+#include <limits>
|
||||
+
|
||||
// include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
--- a/src/corelib/global/qfloat16.h
|
||||
+++ b/src/corelib/global/qfloat16.h
|
||||
@@ -43,6 +43,7 @@
|
||||
|
||||
#include <QtCore/qglobal.h>
|
||||
#include <QtCore/qmetatype.h>
|
||||
+#include <limits>
|
||||
#include <string.h>
|
||||
|
||||
#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
|
||||
--- a/src/corelib/text/qbytearraymatcher.h
|
||||
+++ b/src/corelib/text/qbytearraymatcher.h
|
||||
@@ -42,6 +42,8 @@
|
||||
|
||||
#include <QtCore/qbytearray.h>
|
||||
|
||||
+#include <limits>
|
||||
+
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
||||
29
qt/5.x.x/patches/aa2a39dea5.diff
Normal file
29
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
|
||||
|
||||
42
qt/5.x.x/patches/c72097e.diff
Normal file
42
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.
|
||||
14
qt/5.x.x/patches/dece6f5.diff
Normal file
14
qt/5.x.x/patches/dece6f5.diff
Normal file
@ -0,0 +1,14 @@
|
||||
diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
|
||||
index e070ba977d..35a62f59e3 100644
|
||||
--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
|
||||
+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
|
||||
@@ -43,6 +43,9 @@
|
||||
#include <qpa/qplatformgraphicsbuffer.h>
|
||||
#include <private/qcore_mac_p.h>
|
||||
|
||||
+
|
||||
+#include <CoreGraphics/CGColorSpace.h>
|
||||
+
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QIOSurfaceGraphicsBuffer : public QPlatformGraphicsBuffer
|
||||
11
qt/5.x.x/patches/declarative_missing_header.diff
Normal file
11
qt/5.x.x/patches/declarative_missing_header.diff
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/src/qmldebug/qqmlprofilerevent_p.h
|
||||
+++ b/src/qmldebug/qqmlprofilerevent_p.h
|
||||
@@ -49,7 +49,7 @@
|
||||
|
||||
#include <initializer_list>
|
||||
#include <type_traits>
|
||||
-
|
||||
+#include <limits>
|
||||
//
|
||||
// W A R N I N G
|
||||
// -------------
|
||||
51
qt/5.x.x/patches/f830b86.diff
Normal file
51
qt/5.x.x/patches/f830b86.diff
Normal file
@ -0,0 +1,51 @@
|
||||
From f830b86ef770100f6e3fa234ac3e00eee7a1cd70 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Varga <pvarga@inf.u-szeged.hu>
|
||||
Date: Mon, 16 Nov 2020 11:11:13 +0100
|
||||
Subject: [PATCH] [Backport] mac: make find_sdk.py work when the sdk goes to 11
|
||||
|
||||
Bug: 1098738
|
||||
Change-Id: I25b84537a445ecb8f80241c98d4753932f5f7c90
|
||||
Commit-Queue: Nico Weber <thakis@chromium.org>
|
||||
Commit-Queue: Mark Mentovai <mark@chromium.org>
|
||||
Auto-Submit: Nico Weber <thakis@chromium.org>
|
||||
Reviewed-by: Mark Mentovai <mark@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/master@{#781835}
|
||||
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
---
|
||||
|
||||
diff --git a/chromium/build/mac/find_sdk.py b/chromium/build/mac/find_sdk.py
|
||||
index 38c2883..a2f7455 100755
|
||||
--- a/chromium/build/mac/find_sdk.py
|
||||
+++ b/chromium/build/mac/find_sdk.py
|
||||
@@ -2,8 +2,7 @@
|
||||
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
-
|
||||
-"""Prints the lowest locally available SDK version greater than or equal to a
|
||||
+r"""Prints the lowest locally available SDK version greater than or equal to a
|
||||
given minimum sdk version to standard output.
|
||||
|
||||
If --developer_dir is passed, then the script will use the Xcode toolchain
|
||||
@@ -14,8 +13,10 @@
|
||||
toolchain bin dir.
|
||||
|
||||
Usage:
|
||||
- python find_sdk.py [--developer_dir DEVELOPER_DIR] [--print_sdk_path] \
|
||||
- [--print_bin_path] 10.6 # Ignores SDKs < 10.6
|
||||
+ python find_sdk.py \
|
||||
+ [--print_sdk_path] \
|
||||
+ [--print_bin_path] \
|
||||
+ 10.6 # Ignores SDKs < 10.6
|
||||
|
||||
Sample Output:
|
||||
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk
|
||||
@@ -88,7 +89,7 @@
|
||||
raise SdkError('Install Xcode, launch it, accept the license ' +
|
||||
'agreement, and run `sudo xcode-select -s /path/to/Xcode.app` ' +
|
||||
'to continue.')
|
||||
- sdks = [re.findall('^MacOSX(10\.\d+)\.sdk$', s) for s in os.listdir(sdk_dir)]
|
||||
+ sdks = [re.findall('^MacOSX(\d+\.\d+)\.sdk$', s) for s in os.listdir(sdk_dir)]
|
||||
sdks = [s[0] for s in sdks if s] # [['10.5'], ['10.6']] => ['10.5', '10.6']
|
||||
sdks = [s for s in sdks # ['10.5', '10.6'] => ['10.6']
|
||||
if parse_version(s) >= parse_version(min_sdk_version)]
|
||||
10
qt/5.x.x/patches/fix-gcc-11.diff
Normal file
10
qt/5.x.x/patches/fix-gcc-11.diff
Normal file
@ -0,0 +1,10 @@
|
||||
--- a/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h
|
||||
+++ b/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
+#include <limits>
|
||||
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
66
qt/5.x.x/patches/fix-macdeployqt.diff
Normal file
66
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)
|
||||
284
qt/5.x.x/qtmodules5.15.2.conf
Normal file
284
qt/5.x.x/qtmodules5.15.2.conf
Normal file
@ -0,0 +1,284 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
status = deprecated
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
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
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
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
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
status = essential
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
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
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
status = addon
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
status = addon
|
||||
21
qt/5.x.x/test_package/CMakeLists.txt
Normal file
21
qt/5.x.x/test_package/CMakeLists.txt
Normal file
@ -0,0 +1,21 @@
|
||||
cmake_minimum_required(VERSION 3.1.0)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
|
||||
project(test_package)
|
||||
|
||||
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.cpp greeter.h example.qrc)
|
||||
|
||||
add_executable(${PROJECT_NAME} WIN32 ${SOURCES})
|
||||
|
||||
target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Network Qt5::Sql Qt5::Concurrent Qt5::Xml)
|
||||
119
qt/5.x.x/test_package/conanfile.py
Normal file
119
qt/5.x.x/test_package/conanfile.py
Normal file
@ -0,0 +1,119 @@
|
||||
import os
|
||||
import shutil
|
||||
|
||||
from conans import ConanFile, tools, Meson, RunEnvironment, CMake
|
||||
from conans.errors import ConanException
|
||||
|
||||
|
||||
class TestPackageConan(ConanFile):
|
||||
settings = "os", "compiler", "build_type", "arch"
|
||||
generators = "qt", "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/0.59.3")
|
||||
|
||||
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 tools.cross_building(self) and\
|
||||
not tools.os_info.is_macos and\
|
||||
not self._is_mingw()
|
||||
|
||||
def _build_with_qmake(self):
|
||||
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 ConanException:
|
||||
self.output.info(open("meson_folder/meson-logs/meson-log.txt", 'r').read())
|
||||
raise
|
||||
meson.build()
|
||||
|
||||
def _build_with_cmake_find_package_multi(self):
|
||||
self.output.info("Building with cmake_find_package_multi")
|
||||
env_build = RunEnvironment(self)
|
||||
with tools.environment_append(env_build.vars):
|
||||
cmake = CMake(self, set_cmake_flags=True)
|
||||
if self.settings.os == "Macos":
|
||||
cmake.definitions['CMAKE_OSX_DEPLOYMENT_TARGET'] = '10.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):
|
||||
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("qt.conf", bin_path)
|
||||
self.run(os.path.join(bin_path, "test_package"), run_environment=True)
|
||||
|
||||
def _test_with_meson(self):
|
||||
if self._meson_supported():
|
||||
self.output.info("Testing Meson")
|
||||
shutil.copy("qt.conf", "meson_folder")
|
||||
self.run(os.path.join("meson_folder", "test_package"), run_environment=True)
|
||||
|
||||
def _test_with_cmake_find_package_multi(self):
|
||||
self.output.info("Testing CMake_find_package_multi")
|
||||
shutil.copy("qt.conf", "bin")
|
||||
self.run(os.path.join("bin", "test_package"), run_environment=True)
|
||||
|
||||
def test(self):
|
||||
if not tools.cross_building(self, skip_x64_x86=True):
|
||||
self._test_with_qmake()
|
||||
self._test_with_meson()
|
||||
self._test_with_cmake_find_package_multi()
|
||||
5
qt/5.x.x/test_package/example.qrc
Normal file
5
qt/5.x.x/test_package/example.qrc
Normal file
@ -0,0 +1,5 @@
|
||||
<RCC>
|
||||
<qresource>
|
||||
<file>resource.txt</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
26
qt/5.x.x/test_package/greeter.h
Normal file
26
qt/5.x.x/test_package/greeter.h
Normal file
@ -0,0 +1,26 @@
|
||||
#include <QDebug>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
|
||||
class Greeter : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Greeter(const QString& name, QObject *parent = 0)
|
||||
: QObject(parent)
|
||||
, mName(name) {}
|
||||
|
||||
public slots:
|
||||
void run()
|
||||
{
|
||||
qDebug() << QString("Hello %1!").arg(mName);
|
||||
|
||||
emit finished();
|
||||
}
|
||||
|
||||
signals:
|
||||
void finished();
|
||||
|
||||
private:
|
||||
const QString& mName;
|
||||
};
|
||||
6
qt/5.x.x/test_package/meson.build
Normal file
6
qt/5.x.x/test_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 : 'greeter.h', qresources : 'example.qrc')
|
||||
executable('test_package', 'test_package.cpp', moc_files,
|
||||
dependencies : qt5_dep)
|
||||
1
qt/5.x.x/test_package/resource.txt
Normal file
1
qt/5.x.x/test_package/resource.txt
Normal file
@ -0,0 +1 @@
|
||||
Hello World From Resource
|
||||
52
qt/5.x.x/test_package/test_package.cpp
Normal file
52
qt/5.x.x/test_package/test_package.cpp
Normal file
@ -0,0 +1,52 @@
|
||||
#include <QCoreApplication>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QTimer>
|
||||
#include "greeter.h"
|
||||
#include <QFile>
|
||||
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QtConcurrent>
|
||||
#include <QDomText>
|
||||
#include <QSqlDatabase>
|
||||
|
||||
#include <qplatformdefs.h>
|
||||
|
||||
void f()
|
||||
{
|
||||
qDebug() << "inside f";
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]){
|
||||
QCoreApplication app(argc, argv);
|
||||
QCoreApplication::setApplicationName("Application Example");
|
||||
QCoreApplication::setApplicationVersion("1.0.0");
|
||||
|
||||
QString name = argc > 0 ? argv[1] : "";
|
||||
if (name.isEmpty()) {
|
||||
name = "World";
|
||||
}
|
||||
|
||||
Greeter* greeter = new Greeter(name, &app);
|
||||
QObject::connect(greeter, SIGNAL(finished()), &app, SLOT(quit()));
|
||||
QTimer::singleShot(0, greeter, SLOT(run()));
|
||||
|
||||
QFile f(":/resource.txt");
|
||||
if(!f.open(QIODevice::ReadOnly))
|
||||
qFatal("Could not open resource file");
|
||||
qDebug() << "Resource content:" << f.readAll();
|
||||
f.close();
|
||||
|
||||
qDebug() << W_OK;
|
||||
|
||||
QNetworkAccessManager networkTester;
|
||||
|
||||
QSqlDatabase sqlTester;
|
||||
|
||||
QFuture<void> future = QtConcurrent::run(::f);
|
||||
future.waitForFinished();
|
||||
|
||||
QDomText xmlTester;
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
14
qt/5.x.x/test_package/test_package.pro
Normal file
14
qt/5.x.x/test_package/test_package.pro
Normal file
@ -0,0 +1,14 @@
|
||||
SOURCES += test_package.cpp
|
||||
|
||||
HEADERS += greeter.h
|
||||
|
||||
RESOURCES = example.qrc
|
||||
|
||||
QT -= gui
|
||||
QT += network sql concurrent xml
|
||||
|
||||
CONFIG += console
|
||||
|
||||
CONFIG += conan_basic_setup
|
||||
include($$OUT_PWD/../conanbuildinfo.pri)
|
||||
LIBS -= $$CONAN_LIBS_QT
|
||||
149
qt/6.x.x/conandata.yml
Normal file
149
qt/6.x.x/conandata.yml
Normal file
@ -0,0 +1,149 @@
|
||||
sources:
|
||||
# "6.0.1":
|
||||
# url:
|
||||
# - "https://download.qt.io/archive/qt/6.0/6.0.1/single/qt-everywhere-src-6.0.1.tar.xz"
|
||||
# - "https://qt-mirror.dannhauer.de/archive/qt/6.0/6.0.1/single/qt-everywhere-src-6.0.1.tar.xz"
|
||||
# - "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.0/6.0.1/single/qt-everywhere-src-6.0.1.tar.xz"
|
||||
# - "https://ftp.fau.de/qtproject/archive/qt/6.0/6.0.1/single/qt-everywhere-src-6.0.1.tar.xz"
|
||||
# sha256: "d13cfac103cd80b216cd2f73d0211dd6b1a1de2516911c89ce9c5ed14d9631a8"
|
||||
# "6.0.2":
|
||||
# url:
|
||||
# - "https://download.qt.io/archive/qt/6.0/6.0.2/single/qt-everywhere-src-6.0.2.tar.xz"
|
||||
# - "https://qt-mirror.dannhauer.de/archive/qt/6.0/6.0.2/single/qt-everywhere-src-6.0.2.tar.xz"
|
||||
# - "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.0/6.0.2/single/qt-everywhere-src-6.0.2.tar.xz"
|
||||
# - "https://ftp.fau.de/qtproject/archive/qt/6.0/6.0.2/single/qt-everywhere-src-6.0.2.tar.xz"
|
||||
# sha256: "67a076640647783b95a907d2231e4f34cec69be5ed338c1c1b33124cadf10bdf"
|
||||
# "6.0.3":
|
||||
# url:
|
||||
# - "https://download.qt.io/archive/qt/6.0/6.0.3/single/qt-everywhere-src-6.0.3.tar.xz"
|
||||
# - "https://qt-mirror.dannhauer.de/archive/qt/6.0/6.0.3/single/qt-everywhere-src-6.0.3.tar.xz"
|
||||
# - "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.0/6.0.3/single/qt-everywhere-src-6.0.3.tar.xz"
|
||||
# - "https://ftp.fau.de/qtproject/archive/qt/6.0/6.0.3/single/qt-everywhere-src-6.0.3.tar.xz"
|
||||
# sha256: "ca4a97439443dd0b476a47b284ba772c3b1b041a9eef733e26a789490993a0e3"
|
||||
"6.0.4":
|
||||
url:
|
||||
- "https://download.qt.io/archive/qt/6.0/6.0.4/single/qt-everywhere-src-6.0.4.tar.xz"
|
||||
- "https://qt-mirror.dannhauer.de/archive/qt/6.0/6.0.4/single/qt-everywhere-src-6.0.4.tar.xz"
|
||||
- "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.0/6.0.4/single/qt-everywhere-src-6.0.4.tar.xz"
|
||||
- "https://ftp.fau.de/qtproject/archive/qt/6.0/6.0.4/single/qt-everywhere-src-6.0.4.tar.xz"
|
||||
sha256: "677db6472420f9046b16f7c0d0aa15c4f11f344462a6374feb860625c12fc72b"
|
||||
#"6.1.0":
|
||||
# url:
|
||||
# - "https://download.qt.io/archive/qt/6.1/6.1.0/single/qt-everywhere-src-6.1.0.tar.xz"
|
||||
# - "https://qt-mirror.dannhauer.de/archive/qt/6.1/6.1.0/single/qt-everywhere-src-6.1.0.tar.xz"
|
||||
# - "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.1/6.1.0/single/qt-everywhere-src-6.1.0.tar.xz"
|
||||
# - "https://ftp.fau.de/qtproject/archive/qt/6.1/6.1.0/single/qt-everywhere-src-6.1.0.tar.xz"
|
||||
# sha256: "326a710b08b0973bb4f5306a786548d8b8dd656db75ce9f3f85ea32680d3c88a"
|
||||
#"6.1.1":
|
||||
# url:
|
||||
# - "https://download.qt.io/archive/qt/6.1/6.1.1/single/qt-everywhere-src-6.1.1.tar.xz"
|
||||
# - "https://qt-mirror.dannhauer.de/archive/qt/6.1/6.1.1/single/qt-everywhere-src-6.1.1.tar.xz"
|
||||
# - "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.1/6.1.1/single/qt-everywhere-src-6.1.1.tar.xz"
|
||||
# - "https://ftp.fau.de/qtproject/archive/qt/6.1/6.1.1/single/qt-everywhere-src-6.1.1.tar.xz"
|
||||
# sha256: "6ac937aae4c7b5a3eac90ea4d13f31ded9f78ebc93007bb919fae65c58c808c3"
|
||||
#"6.1.2":
|
||||
# url:
|
||||
# - "https://download.qt.io/archive/qt/6.1/6.1.2/single/qt-everywhere-src-6.1.2.tar.xz"
|
||||
# - "https://qt-mirror.dannhauer.de/archive/qt/6.1/6.1.2/single/qt-everywhere-src-6.1.2.tar.xz"
|
||||
# - "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.1/6.1.2/single/qt-everywhere-src-6.1.2.tar.xz"
|
||||
# - "https://ftp.fau.de/qtproject/archive/qt/6.1/6.1.2/single/qt-everywhere-src-6.1.2.tar.xz"
|
||||
# sha256: "4b40f10eb188506656f13dbf067b714145047f41d7bf83f03b727fa1c7c4cdcb"
|
||||
"6.1.3":
|
||||
url:
|
||||
- "https://download.qt.io/archive/qt/6.1/6.1.3/single/qt-everywhere-src-6.1.3.tar.xz"
|
||||
- "https://qt-mirror.dannhauer.de/archive/qt/6.1/6.1.3/single/qt-everywhere-src-6.1.3.tar.xz"
|
||||
- "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.1/6.1.3/single/qt-everywhere-src-6.1.3.tar.xz"
|
||||
- "https://ftp.fau.de/qtproject/archive/qt/6.1/6.1.3/single/qt-everywhere-src-6.1.3.tar.xz"
|
||||
sha256: "552342a81fa76967656b0301233b4b586d36967fad5cd110765347aebe07413c"
|
||||
"6.2.0":
|
||||
url:
|
||||
- "https://download.qt.io/archive/qt/6.2/6.2.0/single/qt-everywhere-src-6.2.0.tar.xz"
|
||||
- "https://qt-mirror.dannhauer.de/archive/qt/6.2/6.2.0/single/qt-everywhere-src-6.2.0.tar.xz"
|
||||
- "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.2/6.2.0/single/qt-everywhere-src-6.2.0.tar.xz"
|
||||
- "https://ftp.fau.de/qtproject/archive/qt/6.2/6.2.0/single/qt-everywhere-src-6.2.0.tar.xz"
|
||||
sha256: "60c2dc0ee86dd338e5c5194bd95922abfc097841e3e855693dfb4f5aaf0db4db"
|
||||
"6.2.1":
|
||||
url:
|
||||
- "https://download.qt.io/archive/qt/6.2/6.2.1/single/qt-everywhere-src-6.2.1.tar.xz"
|
||||
- "https://qt-mirror.dannhauer.de/archive/qt/6.2/6.2.1/single/qt-everywhere-src-6.2.1.tar.xz"
|
||||
- "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.2/6.2.1/single/qt-everywhere-src-6.2.1.tar.xz"
|
||||
- "https://ftp.fau.de/qtproject/archive/qt/6.2/6.2.1/single/qt-everywhere-src-6.2.1.tar.xz"
|
||||
sha256: "e03fffc5c3b5fea09dcc161444df7dfbbe24e8a8ce9377014ec21b66f48d43cd"
|
||||
"6.2.2":
|
||||
url:
|
||||
- "https://download.qt.io/archive/qt/6.2/6.2.2/single/qt-everywhere-src-6.2.2.tar.xz"
|
||||
- "https://qt-mirror.dannhauer.de/archive/qt/6.2/6.2.2/single/qt-everywhere-src-6.2.2.tar.xz"
|
||||
- "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.2/6.2.2/single/qt-everywhere-src-6.2.2.tar.xz"
|
||||
- "https://ftp.fau.de/qtproject/archive/qt/6.2/6.2.2/single/qt-everywhere-src-6.2.2.tar.xz"
|
||||
sha256: "907994f78d42b30bdea95e290e91930c2d9b593f3f8dd994f44157e387feee0f"
|
||||
"6.2.3":
|
||||
url:
|
||||
- "https://download.qt.io/archive/qt/6.2/6.2.3/single/qt-everywhere-src-6.2.3.tar.xz"
|
||||
- "https://qt-mirror.dannhauer.de/archive/qt/6.2/6.2.3/single/qt-everywhere-src-6.2.3.tar.xz"
|
||||
- "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.2/6.2.3/single/qt-everywhere-src-6.2.3.tar.xz"
|
||||
- "https://ftp.fau.de/qtproject/archive/qt/6.2/6.2.3/single/qt-everywhere-src-6.2.3.tar.xz"
|
||||
sha256: "f784998a159334d1f47617fd51bd0619b9dbfe445184567d2cd7c820ccb12771"
|
||||
patches:
|
||||
"6.0.4":
|
||||
- base_path: "qt6/qtbase/cmake"
|
||||
patch_file: "patches/qt6-pri-helpers-fix.diff"
|
||||
#"6.1.0":
|
||||
# - base_path: "qt6/qtbase/cmake"
|
||||
# patch_file: "patches/qt6-pri-helpers-fix.diff"
|
||||
#"6.1.1":
|
||||
# - base_path: "qt6/qtbase/cmake"
|
||||
# patch_file: "patches/qt6-pri-helpers-fix.diff"
|
||||
#"6.1.2":
|
||||
# - base_path: "qt6/qtdeclarative"
|
||||
# patch_file: "patches/32451d5.diff"
|
||||
# - base_path: "qt6/qtbase/cmake"
|
||||
# patch_file: "patches/qt6-pri-helpers-fix.diff"
|
||||
"6.1.3":
|
||||
- base_path: "qt6/qtdeclarative"
|
||||
patch_file: "patches/32451d5.diff"
|
||||
- base_path: "qt6/qtbase/cmake"
|
||||
patch_file: "patches/qt6-pri-helpers-fix.diff"
|
||||
"6.2.0":
|
||||
- base_path: "qt6/qtdeclarative"
|
||||
patch_file: "patches/32451d5.diff"
|
||||
- base_path: "qt6/qtbase/cmake"
|
||||
patch_file: "patches/qt6-pri-helpers-fix.diff"
|
||||
- patch_file: "patches/c72097e.diff"
|
||||
base_path: "qt6/qtwebengine"
|
||||
- patch_file: "patches/138a720.diff"
|
||||
base_path: "qt6/qtwebengine/src/3rdparty"
|
||||
- patch_file: "patches/5fe0b82.patch"
|
||||
base_path: "qt6/qttools/src/assistant/qlitehtml/src/3rdparty/litehtml"
|
||||
"6.2.1":
|
||||
- base_path: "qt6/qtdeclarative"
|
||||
patch_file: "patches/32451d5.diff"
|
||||
- base_path: "qt6/qtbase/cmake"
|
||||
patch_file: "patches/qt6-pri-helpers-fix.diff"
|
||||
- patch_file: "patches/c72097e.diff"
|
||||
base_path: "qt6/qtwebengine"
|
||||
- patch_file: "patches/138a720.diff"
|
||||
base_path: "qt6/qtwebengine/src/3rdparty"
|
||||
- patch_file: "patches/5fe0b82.patch"
|
||||
base_path: "qt6/qttools/src/assistant/qlitehtml/src/3rdparty/litehtml"
|
||||
- base_path: "qt6/qtbase"
|
||||
patch_file: "patches/dece6f5.patch"
|
||||
- base_path: "qt6/qtwebengine/src/3rdparty"
|
||||
patch_file: "patches/c76d2f6.patch"
|
||||
"6.2.2":
|
||||
- base_path: "qt6/qtdeclarative"
|
||||
patch_file: "patches/32451d5.diff"
|
||||
- base_path: "qt6/qtbase/cmake"
|
||||
patch_file: "patches/qt6-pri-helpers-fix.diff"
|
||||
- patch_file: "patches/c72097e.diff"
|
||||
base_path: "qt6/qtwebengine"
|
||||
- patch_file: "patches/138a720.diff"
|
||||
base_path: "qt6/qtwebengine/src/3rdparty"
|
||||
"6.2.3":
|
||||
- base_path: "qt6/qtdeclarative"
|
||||
patch_file: "patches/32451d5.diff"
|
||||
- base_path: "qt6/qtbase/cmake"
|
||||
patch_file: "patches/qt6-pri-helpers-fix.diff"
|
||||
- patch_file: "patches/c72097e.diff"
|
||||
base_path: "qt6/qtwebengine"
|
||||
- patch_file: "patches/138a720.diff"
|
||||
base_path: "qt6/qtwebengine/src/3rdparty"
|
||||
1292
qt/6.x.x/conanfile.py
Normal file
1292
qt/6.x.x/conanfile.py
Normal file
File diff suppressed because it is too large
Load Diff
21
qt/6.x.x/patches/138a720.diff
Normal file
21
qt/6.x.x/patches/138a720.diff
Normal file
@ -0,0 +1,21 @@
|
||||
From 138a7203f16cf356e9d4dac697920a22437014b0 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Varga <pvarga@inf.u-szeged.hu>
|
||||
Date: Fri, 13 Nov 2020 11:09:23 +0100
|
||||
Subject: [PATCH] Fix build with msvc2019 16.8.0
|
||||
|
||||
Fixes: QTBUG-88708
|
||||
Change-Id: I3554ceec0437801b4861f68edd504d01fc01cf93
|
||||
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
---
|
||||
|
||||
diff --git a/chromium/third_party/blink/renderer/platform/graphics/dark_mode_lab_color_space.h b/chromium/third_party/blink/renderer/platform/graphics/dark_mode_lab_color_space.h
|
||||
index 78c316e..136c796 100644
|
||||
--- a/chromium/third_party/blink/renderer/platform/graphics/dark_mode_lab_color_space.h
|
||||
+++ b/chromium/third_party/blink/renderer/platform/graphics/dark_mode_lab_color_space.h
|
||||
@@ -145,5 +145,5 @@
|
||||
// https://en.wikipedia.org/wiki/CIELAB_color_space#Forward_transformation.
|
||||
SkV3 ToXYZ(const SkV3& lab) const {
|
||||
auto invf = [](float x) -> float {
|
||||
- return x > kSigma ? pow(x, 3) : 3 * kSigma2 * (x - 4.0f / 29.0f);
|
||||
+ return x > kSigma ? (float)pow(x, 3) : 3 * kSigma2 * (x - 4.0f / 29.0f);
|
||||
};
|
||||
32
qt/6.x.x/patches/32451d5.diff
Normal file
32
qt/6.x.x/patches/32451d5.diff
Normal file
@ -0,0 +1,32 @@
|
||||
From 32451d5c9126921180aad4bf78ec6af5eb27ec2a Mon Sep 17 00:00:00 2001
|
||||
From: Ulf Hermann <ulf.hermann@qt.io>
|
||||
Date: Tue, 13 Jul 2021 11:05:51 +0200
|
||||
Subject: [PATCH] Directly include Unicode.h in YarrCanonicalize.h
|
||||
|
||||
The redirection via utypes.h can be problematic if you have another
|
||||
utypes.h around in a prominent place. It's easily avoided, though.
|
||||
|
||||
Fixes: QTBUG-77528
|
||||
Change-Id: I50368f56b0d7eb957955900a32dbb625a38d02af
|
||||
---
|
||||
|
||||
diff --git a/src/3rdparty/masm/stubs/wtf/unicode/utypes.h b/src/3rdparty/masm/stubs/wtf/unicode/utypes.h
|
||||
deleted file mode 100644
|
||||
index e1b4ff9..0000000
|
||||
--- a/src/3rdparty/masm/stubs/wtf/unicode/utypes.h
|
||||
+++ /dev/null
|
||||
@@ -1 +0,0 @@
|
||||
-#include <unicode/Unicode.h>
|
||||
diff --git a/src/3rdparty/masm/yarr/YarrCanonicalize.h b/src/3rdparty/masm/yarr/YarrCanonicalize.h
|
||||
index cbd279e..17c9831 100644
|
||||
--- a/src/3rdparty/masm/yarr/YarrCanonicalize.h
|
||||
+++ b/src/3rdparty/masm/yarr/YarrCanonicalize.h
|
||||
@@ -26,7 +26,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <stdint.h>
|
||||
-#include <unicode/utypes.h>
|
||||
+#include <unicode/Unicode.h>
|
||||
|
||||
namespace JSC { namespace Yarr {
|
||||
|
||||
23
qt/6.x.x/patches/5fe0b82.patch
Normal file
23
qt/6.x.x/patches/5fe0b82.patch
Normal file
@ -0,0 +1,23 @@
|
||||
From bb01af1c36cebd08d407c9a06e5a3c906bd9a660 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Jan van Kampen <mjvk@allseas.com>
|
||||
Date: Wed, 27 Oct 2021 06:49:11 +0200
|
||||
Subject: [PATCH] Adds missing includes to utf8_strings.h
|
||||
|
||||
---
|
||||
include/litehtml/utf8_strings.h | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/include/litehtml/utf8_strings.h b/include/litehtml/utf8_strings.h
|
||||
index c5b2421..35d474f 100644
|
||||
--- a/include/litehtml/utf8_strings.h
|
||||
+++ b/include/litehtml/utf8_strings.h
|
||||
@@ -1,6 +1,9 @@
|
||||
#ifndef LH_UTF8_STRINGS_H
|
||||
#define LH_UTF8_STRINGS_H
|
||||
|
||||
+#include "os_types.h"
|
||||
+#include "types.h"
|
||||
+
|
||||
namespace litehtml
|
||||
{
|
||||
class utf8_to_wchar
|
||||
42
qt/6.x.x/patches/c72097e.diff
Normal file
42
qt/6.x.x/patches/c72097e.diff
Normal file
@ -0,0 +1,42 @@
|
||||
From c72097e8790553771daf3231124c3fbe1a438379 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Thu, 30 Mar 2017 11:37:24 +0300
|
||||
Subject: [PATCH] chromium: workaround for too long .rps file name
|
||||
|
||||
Ninja may fail when the build directory is too long:
|
||||
|
||||
ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\
|
||||
interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\
|
||||
6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\
|
||||
.0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\
|
||||
le.rsp): Unable to create file. File name too long
|
||||
|
||||
Task-number: QTBUG-59769
|
||||
Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
|
||||
---
|
||||
src/3rdparty/gn/src/gn/ninja_action_target_writer.cc | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc b/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc
|
||||
index a5bc6cd..5cefbfe 100644
|
||||
--- a/src/3rdparty/gn/src/gn/ninja_action_target_writer.cc
|
||||
+++ b/src/3rdparty/gn/tosrcols/gn/ninja_action_target_writer.cc
|
||||
@@ -122,9 +122,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
|
||||
// strictly necessary for regular one-shot actions, but it's easier to
|
||||
// just always define unique_name.
|
||||
std::string rspfile = custom_rule_name;
|
||||
+
|
||||
+ //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end
|
||||
+ //please note ".$unique_name" is not used at the moment
|
||||
+ int pos = 0;
|
||||
+ std::string delimiter("_");
|
||||
+ while (rspfile.length() > 250 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos)
|
||||
+ rspfile = rspfile.substr(0,pos);
|
||||
+
|
||||
if (!target_->sources().empty())
|
||||
rspfile += ".$unique_name";
|
||||
rspfile += ".rsp";
|
||||
+
|
||||
out_ << " rspfile = " << rspfile << std::endl;
|
||||
|
||||
// Response file contents.
|
||||
70
qt/6.x.x/patches/c76d2f6.patch
Normal file
70
qt/6.x.x/patches/c76d2f6.patch
Normal file
@ -0,0 +1,70 @@
|
||||
From c76d2f6e997d84d81b0b22e0bd3afdaf7acfe3b3 Mon Sep 17 00:00:00 2001
|
||||
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
Date: Wed, 13 Oct 2021 12:36:02 +0200
|
||||
Subject: [PATCH] Fix build with Win10 21H1 SDK and Win11 SDK
|
||||
|
||||
Different parts are not fully defined
|
||||
|
||||
Task-number: QTBUG-96533
|
||||
Change-Id: I4fcb795cea33c519ee082aa69a63660e581a2759
|
||||
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
---
|
||||
chromium/media/gpu/windows/d3d11_av1_accelerator.cc | 2 ++
|
||||
chromium/sandbox/win/src/process_mitigations.h | 13 +++++++++----
|
||||
2 files changed, 11 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/chromium/media/gpu/windows/d3d11_av1_accelerator.cc b/chromium/media/gpu/windows/d3d11_av1_accelerator.cc
|
||||
index 8d2d808ed2a..a4d3a79d7c5 100644
|
||||
--- a/chromium/media/gpu/windows/d3d11_av1_accelerator.cc
|
||||
+++ b/chromium/media/gpu/windows/d3d11_av1_accelerator.cc
|
||||
@@ -15,6 +15,7 @@
|
||||
#include "media/gpu/codec_picture.h"
|
||||
#include "media/gpu/windows/d3d11_picture_buffer.h"
|
||||
|
||||
+#if !defined(NTDDI_WIN10_FE) // Windows 10.0.20348.0
|
||||
// These are from <dxva.h> in a newer SDK than the one Chrome ships with. They
|
||||
// should be deleted once Chrome switches to the updated SDK; they have been
|
||||
// copied from: https://www.microsoft.com/en-us/download/details.aspx?id=101577
|
||||
@@ -279,6 +280,7 @@ typedef struct _DXVA_Tile_AV1 {
|
||||
UCHAR Reserved8Bits;
|
||||
} DXVA_Tile_AV1, *LPDXVA_Tile_AV1;
|
||||
#pragma pack(pop)
|
||||
+#endif // !defined(NTDDI_WIN10_FE)
|
||||
|
||||
namespace media {
|
||||
|
||||
diff --git a/chromium/sandbox/win/src/process_mitigations.h b/chromium/sandbox/win/src/process_mitigations.h
|
||||
index 3b511fe2bd9..72b314c335e 100644
|
||||
--- a/chromium/sandbox/win/src/process_mitigations.h
|
||||
+++ b/chromium/sandbox/win/src/process_mitigations.h
|
||||
@@ -12,21 +12,26 @@
|
||||
#include "sandbox/win/src/security_level.h"
|
||||
|
||||
// This will be defined in an upcoming Windows SDK release
|
||||
-#ifndef COMPONENT_KTM
|
||||
+#ifndef PROC_THREAD_ATTRIBUTE_MACHINE_TYPE
|
||||
|
||||
+#ifndef COMPONENT_KTM
|
||||
#define COMPONENT_KTM 0x01
|
||||
#define COMPONENT_VALID_FLAGS (COMPONENT_KTM)
|
||||
-#define ProcThreadAttributeComponentFilter 26
|
||||
|
||||
typedef struct _COMPONENT_FILTER {
|
||||
ULONG ComponentFlags;
|
||||
} COMPONENT_FILTER, *PCOMPONENT_FILTER;
|
||||
+#endif // COMPONENT_KTM
|
||||
|
||||
+#define ProcThreadAttributeComponentFilter 26
|
||||
+#endif // PROC_THREAD_ATTRIBUTE_MACHINE_TYPE
|
||||
+
|
||||
+// This seems to remain undefined in newer SDKs
|
||||
+#ifndef PROC_THREAD_ATTRIBUTE_COMPONENT_FILTER
|
||||
#define PROC_THREAD_ATTRIBUTE_COMPONENT_FILTER \
|
||||
ProcThreadAttributeValue(ProcThreadAttributeComponentFilter, FALSE, TRUE, \
|
||||
FALSE)
|
||||
-
|
||||
-#endif // COMPONENT_KTM
|
||||
+#endif
|
||||
|
||||
namespace sandbox {
|
||||
|
||||
25
qt/6.x.x/patches/dece6f5.patch
Normal file
25
qt/6.x.x/patches/dece6f5.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From dece6f5840463ae2ddf927d65eb1b3680e34a547 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=C3=98ystein=20Heskestad?= <oystein.heskestad@qt.io>
|
||||
Date: Wed, 27 Oct 2021 13:07:46 +0200
|
||||
Subject: Add missing macOS header file that was indirectly included before
|
||||
|
||||
Change-Id: I4d4c7d4f957fc36dea5e06eb6d661aeecf6385f1
|
||||
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
||||
---
|
||||
src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
(limited to 'src/plugins/platforms/cocoa')
|
||||
|
||||
diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
|
||||
index 5d4b6d6a71..cc7193d8b7 100644
|
||||
--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
|
||||
+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
|
||||
@@ -43,6 +43,7 @@
|
||||
#include <qpa/qplatformgraphicsbuffer.h>
|
||||
#include <private/qcore_mac_p.h>
|
||||
|
||||
+#include <CoreGraphics/CGColorSpace.h>
|
||||
#include <IOSurface/IOSurface.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
15
qt/6.x.x/patches/qt6-pri-helpers-fix.diff
Normal file
15
qt/6.x.x/patches/qt6-pri-helpers-fix.diff
Normal file
@ -0,0 +1,15 @@
|
||||
--- QtPriHelpers.cmake.original 2021-08-03 23:38:06.343653948 +0300
|
||||
+++ QtPriHelpers.cmake 2021-08-03 23:26:24.483637483 +0300
|
||||
@@ -30,7 +30,11 @@
|
||||
if(lib_target_type STREQUAL "INTERFACE_LIBRARY")
|
||||
get_target_property(iface_libs ${lib_target} INTERFACE_LINK_LIBRARIES)
|
||||
if(iface_libs)
|
||||
- list(PREPEND lib_targets ${iface_libs})
|
||||
+ foreach (iface_lib ${iface_libs})
|
||||
+ if (NOT "${iface_lib}" STREQUAL "${lib_target}")
|
||||
+ list(PREPEND lib_targets ${iface_lib})
|
||||
+ endif ()
|
||||
+ endforeach ()
|
||||
endif()
|
||||
else()
|
||||
list(APPEND lib_libs "$<TARGET_LINKER_FILE:${lib_target}>")
|
||||
325
qt/6.x.x/qtmodules6.0.1.conf
Normal file
325
qt/6.x.x/qtmodules6.0.1.conf
Normal file
@ -0,0 +1,325 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
project = -
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
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 = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtimageformats qtgraphicaleffects
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.0
|
||||
status = deprecated
|
||||
325
qt/6.x.x/qtmodules6.0.2.conf
Normal file
325
qt/6.x.x/qtmodules6.0.2.conf
Normal file
@ -0,0 +1,325 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
project = -
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
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 = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtimageformats qtgraphicaleffects
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.0
|
||||
status = deprecated
|
||||
343
qt/6.x.x/qtmodules6.0.3.conf
Normal file
343
qt/6.x.x/qtmodules6.0.3.conf
Normal file
@ -0,0 +1,343 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
project = -
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.0
|
||||
status = additionalLibrary
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.0
|
||||
status = additionalLibrary
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
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 = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtimageformats qtgraphicaleffects
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.0
|
||||
status = additionalLibrary
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.0
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase qttools
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.0
|
||||
status = additionalLibrary
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative qttools
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.0
|
||||
status = additionalLibrary
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative qtquickcontrols2 qttools
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.0
|
||||
status = additionalLibrary
|
||||
343
qt/6.x.x/qtmodules6.0.4.conf
Normal file
343
qt/6.x.x/qtmodules6.0.4.conf
Normal file
@ -0,0 +1,343 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
project = -
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.0
|
||||
status = additionalLibrary
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.0
|
||||
status = additionalLibrary
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
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 = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtimageformats qtgraphicaleffects
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 6.0
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.0
|
||||
status = additionalLibrary
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.0
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.0
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase qttools
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.0
|
||||
status = additionalLibrary
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative qttools
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.0
|
||||
status = additionalLibrary
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative qtquickcontrols2 qttools
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.0
|
||||
status = additionalLibrary
|
||||
343
qt/6.x.x/qtmodules6.1.0.conf
Normal file
343
qt/6.x.x/qtmodules6.1.0.conf
Normal file
@ -0,0 +1,343 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.1.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.1.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.1.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.1.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.1.0
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
project = -
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
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 = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtimageformats qtgraphicaleffects
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 6.1.0
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.1.0
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase qttools
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative qttools
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative qtquickcontrols2 qttools
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.1.0
|
||||
status = addon
|
||||
343
qt/6.x.x/qtmodules6.1.1.conf
Normal file
343
qt/6.x.x/qtmodules6.1.1.conf
Normal file
@ -0,0 +1,343 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.1.1
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.1.1
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.1.1
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.1.1
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.1.1
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
project = -
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
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 = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtimageformats qtgraphicaleffects
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 6.1.1
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.1.1
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase qttools
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative qttools
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative qtquickcontrols2 qttools
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.1.1
|
||||
status = addon
|
||||
343
qt/6.x.x/qtmodules6.1.2.conf
Normal file
343
qt/6.x.x/qtmodules6.1.2.conf
Normal file
@ -0,0 +1,343 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.1.2
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.1.2
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.1.2
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.1.2
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.1.2
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
project = -
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
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 = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtimageformats qtgraphicaleffects
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 6.1.2
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.1.2
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase qttools
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative qttools
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative qtquickcontrols2 qttools
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.1.2
|
||||
status = addon
|
||||
343
qt/6.x.x/qtmodules6.1.3.conf
Normal file
343
qt/6.x.x/qtmodules6.1.3.conf
Normal file
@ -0,0 +1,343 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.1.3
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.1.3
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.1.3
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.1.3
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.1.3
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
project = -
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
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 = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtimageformats qtgraphicaleffects
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 6.1.3
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.1.3
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase qttools
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative qttools
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative qtquickcontrols2 qttools
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.1.3
|
||||
status = addon
|
||||
292
qt/6.x.x/qtmodules6.2.0.conf
Normal file
292
qt/6.x.x/qtmodules6.2.0.conf
Normal file
@ -0,0 +1,292 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.2.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.2.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.2.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 6.2.0
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.2.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.2.0
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
project = -
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 6.2.0
|
||||
status = ignore
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 6.2.0
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.2.0
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 6.2.0
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.2.0
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
292
qt/6.x.x/qtmodules6.2.1.conf
Normal file
292
qt/6.x.x/qtmodules6.2.1.conf
Normal file
@ -0,0 +1,292 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.2.1
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.2.1
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.2.1
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 6.2.1
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.2.1
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.2.1
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
project = -
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 6.2.1
|
||||
status = ignore
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 6.2.1
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.2.1
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 6.2.1
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.2.1
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.2.1
|
||||
status = addon
|
||||
299
qt/6.x.x/qtmodules6.2.2.conf
Normal file
299
qt/6.x.x/qtmodules6.2.2.conf
Normal file
@ -0,0 +1,299 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.2.2
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.2.2
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.2.2
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 6.2.2
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.2.2
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.2.2
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
project = -
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase qtpositioning
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.2.2
|
||||
status = ignore
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 6.2.2
|
||||
status = ignore
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 6.2.2
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.2.2
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 6.2.2
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.2.2
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.2.2
|
||||
status = addon
|
||||
299
qt/6.x.x/qtmodules6.2.3.conf
Normal file
299
qt/6.x.x/qtmodules6.2.3.conf
Normal file
@ -0,0 +1,299 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.2.3
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.2.3
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.2.3
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 6.2.3
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.2.3
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.2.3
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
project = -
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase qtpositioning
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.2.3
|
||||
status = ignore
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 6.2.3
|
||||
status = ignore
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 6.2.3
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.2.3
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 6.2.3
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.2.3
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.2.3
|
||||
status = addon
|
||||
25
qt/6.x.x/test_package/CMakeLists.txt
Normal file
25
qt/6.x.x/test_package/CMakeLists.txt
Normal file
@ -0,0 +1,25 @@
|
||||
cmake_minimum_required(VERSION 3.3.0)
|
||||
|
||||
project(test_package)
|
||||
|
||||
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
|
||||
conan_set_vs_runtime()
|
||||
conan_set_libcxx()
|
||||
conan_output_dirs_setup()
|
||||
|
||||
find_package(Qt6 COMPONENTS Core Network Sql Concurrent Xml REQUIRED CONFIG)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
add_executable(${PROJECT_NAME} test_package.cpp greeter.h example.qrc)
|
||||
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME} Qt6::Core Qt6::Network Qt6::Sql Qt6::Concurrent Qt6::Xml)
|
||||
|
||||
# check if extra qt cmake functions are usable
|
||||
qt_add_executable(${PROJECT_NAME}2 test_package.cpp greeter.h example.qrc)
|
||||
|
||||
set_property(TARGET ${PROJECT_NAME}2 PROPERTY CXX_STANDARD 17)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME}2 PRIVATE Qt6::Core Qt6::Network Qt6::Sql Qt6::Concurrent Qt6::Xml)
|
||||
131
qt/6.x.x/test_package/conanfile.py
Normal file
131
qt/6.x.x/test_package/conanfile.py
Normal file
@ -0,0 +1,131 @@
|
||||
import os
|
||||
import shutil
|
||||
|
||||
from conans import ConanFile, tools, Meson, RunEnvironment, CMake
|
||||
from conans.errors import ConanException
|
||||
|
||||
|
||||
class TestPackageConan(ConanFile):
|
||||
settings = "os", "compiler", "build_type", "arch"
|
||||
generators = "qt", "cmake", "cmake_find_package_multi", "cmake_find_package", "pkg_config", "qmake"
|
||||
|
||||
def build_requirements(self):
|
||||
self.build_requires("cmake/3.22.0")
|
||||
if self._meson_supported():
|
||||
self.build_requires("meson/0.60.2")
|
||||
|
||||
def _is_mingw(self):
|
||||
return self.settings.os == "Windows" and self.settings.compiler == "gcc"
|
||||
|
||||
def _meson_supported(self):
|
||||
return False and self.options["qt"].shared and\
|
||||
not tools.cross_building(self) and\
|
||||
not tools.os_info.is_macos and\
|
||||
not self._is_mingw()
|
||||
|
||||
def _qmake_supported(self):
|
||||
return self.settings.compiler != "Visual Studio" or self.options["qt"].shared
|
||||
|
||||
def _cmake_multi_supported(self):
|
||||
return True
|
||||
|
||||
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.append('QMAKE_CC="%s"' % value)
|
||||
|
||||
value = _getenvpath('CXX')
|
||||
if value:
|
||||
args.append('QMAKE_CXX="%s"' % value)
|
||||
|
||||
value = _getenvpath('LD')
|
||||
if value:
|
||||
args.append('QMAKE_LINK_C="%s"' % value)
|
||||
args.append('QMAKE_LINK_C_SHLIB="%s"' % value)
|
||||
args.append('QMAKE_LINK="%s"' % value)
|
||||
args.append('QMAKE_LINK_SHLIB="%s"' % value)
|
||||
|
||||
self.run("qmake %s" % " ".join(args), run_environment=True)
|
||||
if tools.os_info.is_windows:
|
||||
if self.settings.compiler == "Visual Studio":
|
||||
self.run("nmake", run_environment=True)
|
||||
else:
|
||||
self.run("mingw32-make", run_environment=True)
|
||||
else:
|
||||
self.run("make", run_environment=True)
|
||||
|
||||
def _build_with_meson(self):
|
||||
if self._meson_supported():
|
||||
self.output.info("Building with Meson")
|
||||
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 ConanException:
|
||||
self.output.info(open("meson_folder/meson-logs/meson-log.txt", 'r').read())
|
||||
raise
|
||||
meson.build()
|
||||
|
||||
def _build_with_cmake_find_package_multi(self):
|
||||
if not self._cmake_multi_supported():
|
||||
return
|
||||
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("qt.conf", bin_path)
|
||||
self.run(os.path.join(bin_path, "test_package"), run_environment=True)
|
||||
|
||||
def _test_with_meson(self):
|
||||
if self._meson_supported():
|
||||
self.output.info("Testing Meson")
|
||||
shutil.copy("qt.conf", "meson_folder")
|
||||
self.run(os.path.join("meson_folder", "test_package"), run_environment=True)
|
||||
|
||||
def _test_with_cmake_find_package_multi(self):
|
||||
if not self._cmake_multi_supported():
|
||||
return
|
||||
self.output.info("Testing CMake_find_package_multi")
|
||||
shutil.copy("qt.conf", "bin")
|
||||
self.run(os.path.join("bin", "test_package"), run_environment=True)
|
||||
|
||||
def test(self):
|
||||
if not tools.cross_building(self, skip_x64_x86=True):
|
||||
self._test_with_qmake()
|
||||
self._test_with_meson()
|
||||
self._test_with_cmake_find_package_multi()
|
||||
5
qt/6.x.x/test_package/example.qrc
Normal file
5
qt/6.x.x/test_package/example.qrc
Normal file
@ -0,0 +1,5 @@
|
||||
<RCC>
|
||||
<qresource>
|
||||
<file>resource.txt</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
26
qt/6.x.x/test_package/greeter.h
Normal file
26
qt/6.x.x/test_package/greeter.h
Normal file
@ -0,0 +1,26 @@
|
||||
#include <QDebug>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
|
||||
class Greeter : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Greeter(const QString& name, QObject *parent = 0)
|
||||
: QObject(parent)
|
||||
, mName(name) {}
|
||||
|
||||
public slots:
|
||||
void run()
|
||||
{
|
||||
qDebug() << QString("Hello %1!").arg(mName);
|
||||
|
||||
emit finished();
|
||||
}
|
||||
|
||||
signals:
|
||||
void finished();
|
||||
|
||||
private:
|
||||
const QString& mName;
|
||||
};
|
||||
6
qt/6.x.x/test_package/meson.build
Normal file
6
qt/6.x.x/test_package/meson.build
Normal file
@ -0,0 +1,6 @@
|
||||
project('test_package', 'cpp')
|
||||
qt6 = import('qt6')
|
||||
qt6_dep = dependency('qt6', modules: ['Core', 'Network', 'Sql', 'Concurrent', 'Xml'])
|
||||
moc_files = qt6.preprocess(moc_headers : 'greeter.h', qresources : 'example.qrc')
|
||||
executable('test_package', 'test_package.cpp', moc_files,
|
||||
dependencies : qt6_dep)
|
||||
1
qt/6.x.x/test_package/resource.txt
Normal file
1
qt/6.x.x/test_package/resource.txt
Normal file
@ -0,0 +1 @@
|
||||
Hello World From Resource
|
||||
48
qt/6.x.x/test_package/test_package.cpp
Normal file
48
qt/6.x.x/test_package/test_package.cpp
Normal file
@ -0,0 +1,48 @@
|
||||
#include <QCoreApplication>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QTimer>
|
||||
#include <QFile>
|
||||
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QSqlDatabase>
|
||||
#include <qtconcurrentfilter.h>
|
||||
#include <QDomText>
|
||||
|
||||
#include "greeter.h"
|
||||
|
||||
int main(int argc, char *argv[]){
|
||||
QCoreApplication app(argc, argv);
|
||||
QCoreApplication::setApplicationName("Application Example");
|
||||
QCoreApplication::setApplicationVersion("1.0.0");
|
||||
|
||||
QString name = argc > 0 ? argv[1] : "";
|
||||
if (name.isEmpty()) {
|
||||
name = "World";
|
||||
}
|
||||
|
||||
Greeter* greeter = new Greeter(name, &app);
|
||||
QObject::connect(greeter, SIGNAL(finished()), &app, SLOT(quit()));
|
||||
QTimer::singleShot(0, greeter, SLOT(run()));
|
||||
|
||||
QFile f(":/resource.txt");
|
||||
if(!f.open(QIODevice::ReadOnly))
|
||||
qFatal("Could not open resource file");
|
||||
qDebug() << "Resource content:" << f.readAll();
|
||||
f.close();
|
||||
|
||||
QNetworkAccessManager networkTester;
|
||||
|
||||
QSqlDatabase sqlTester;
|
||||
|
||||
QVector<int> v;
|
||||
v << 1 << 2 << 3 << 4;
|
||||
QtConcurrent::blockingFilter(v, [](int i)
|
||||
{
|
||||
return i % 2;
|
||||
});
|
||||
|
||||
QDomText xmlTester;
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
15
qt/6.x.x/test_package/test_package.pro
Normal file
15
qt/6.x.x/test_package/test_package.pro
Normal file
@ -0,0 +1,15 @@
|
||||
include($$OUT_PWD/../conanbuildinfo.pri)
|
||||
|
||||
LIBS += $$CONAN_LIBDIRS
|
||||
|
||||
SOURCES += test_package.cpp
|
||||
|
||||
HEADERS += greeter.h
|
||||
|
||||
RESOURCES = example.qrc
|
||||
|
||||
QT += network sql concurrent xml
|
||||
|
||||
QT -= gui
|
||||
|
||||
CONFIG += console
|
||||
27
qt/config.yml
Normal file
27
qt/config.yml
Normal file
@ -0,0 +1,27 @@
|
||||
versions:
|
||||
"5.15.2":
|
||||
folder: 5.x.x
|
||||
# "6.0.1":
|
||||
# folder: 6.x.x
|
||||
# "6.0.2":
|
||||
# folder: 6.x.x
|
||||
# "6.0.3":
|
||||
# folder: 6.x.x
|
||||
"6.0.4":
|
||||
folder: 6.x.x
|
||||
#"6.1.0":
|
||||
# folder: 6.x.x
|
||||
#"6.1.1":
|
||||
# folder: 6.x.x
|
||||
#"6.1.2":
|
||||
# folder: 6.x.x
|
||||
"6.1.3":
|
||||
folder: 6.x.x
|
||||
"6.2.0":
|
||||
folder: 6.x.x
|
||||
"6.2.1":
|
||||
folder: 6.x.x
|
||||
"6.2.2":
|
||||
folder: 6.x.x
|
||||
"6.2.3":
|
||||
folder: 6.x.x
|
||||
Loading…
x
Reference in New Issue
Block a user