aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitmodules80
-rw-r--r--coin/platform_configs/qt3d-runtime.txt3
m---------qt3d0
m---------qtbase0
m---------qtdatavis3d0
m---------qtdeclarative0
m---------qtdoc0
m---------qtgraphicaleffects0
m---------qtlocation0
m---------qtquickcontrols0
m---------qtquickcontrols20
m---------qtremoteobjects0
m---------qtserialbus0
m---------qttools0
m---------qtwayland0
m---------qtwebengine0
m---------qtwebglplugin0
m---------qtxmlpatterns0
18 files changed, 42 insertions, 41 deletions
diff --git a/.gitmodules b/.gitmodules
index 1c21bce2..31bb5338 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,60 +1,60 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
- branch = 5.12
+ branch = 5.12.0
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
- branch = 5.12
+ branch = 5.12.0
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
- branch = 5.12
+ branch = 5.12.0
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
- branch = 5.12
+ branch = 5.12.0
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
- branch = 5.12
+ branch = 5.12.0
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
- branch = 5.12
+ branch = 5.12.0
status = essential
priority = 30
[submodule "qtdoc"]
@@ -62,7 +62,7 @@
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
path = qtdoc
url = ../qtdoc.git
- branch = 5.12
+ branch = 5.12.0
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -83,14 +83,14 @@
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation
url = ../qtlocation.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -123,185 +123,185 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel
path = qtwebengine
url = ../qtwebengine.git
- branch = 5.12
+ branch = 5.12.0
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
- branch = 5.12
+ branch = 5.12.0
status = essential
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtpurchasing
url = ../qtpurchasing.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
- branch = 5.12
+ branch = 5.12.0
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
- branch = 5.12
+ branch = 5.12.0
status = preview
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
- branch = 5.12
+ branch = 5.12.0
status = preview
diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt
index fdc51d6b..5a189f25 100644
--- a/coin/platform_configs/qt3d-runtime.txt
+++ b/coin/platform_configs/qt3d-runtime.txt
@@ -9,11 +9,12 @@ qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017
qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2
diff --git a/qt3d b/qt3d
-Subproject 3bc2e44bd387aa2185083fcf94eeee67f37380f
+Subproject 3d75a66c2908faa39d25b55f3d4b8ff3d0c5c4b
diff --git a/qtbase b/qtbase
-Subproject 269172037db11d6e62bcef2d5c7491af9244f20
+Subproject c6c31b14a73674459eb5e762bb7487900b8c4b3
diff --git a/qtdatavis3d b/qtdatavis3d
-Subproject 1ad75d1169764b599bd5fe6d1a3d9c1745e9f5c
+Subproject 12d9593daeb8ffc7e50d068923afaf848083dcd
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 475c74a9926efcd968572563e678988e5380460
+Subproject 6734ee9a6ddb6a3870556514a70d90483625855
diff --git a/qtdoc b/qtdoc
-Subproject 229e4efc076d6a6746f1e659c59696e05e1d1c4
+Subproject e8422196ce16a0a9abdb2b342f9caeb8ef7a614
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject b448bcb6df108d85e161d57307b398236df3a80
+Subproject 314a2b53a885a41f0a220fdcd5e8cd4592078b2
diff --git a/qtlocation b/qtlocation
-Subproject 9abf021df39a6b1159a091ea37258830ebdbfef
+Subproject 0cdf4748dd40ec2e0df20eda4a63e8e070d2b79
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject 5db6659d65062353cfa6425f7790ea34f1b4a3f
+Subproject c345d1ddf66fa73660a299826b9e3a3328519be
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject 6e543aba8064663c889325f519a5bc5f0750477
+Subproject 2876332ad911b3c0402006ca9116af66cecdb8e
diff --git a/qtremoteobjects b/qtremoteobjects
-Subproject e8f49d3bf0557cc3c1b1e0358bed720023fdc2b
+Subproject 09a6746ec6d2a21415f8e0b0a8817510f1b8b2e
diff --git a/qtserialbus b/qtserialbus
-Subproject df179c4c18d8feeef48e38cc76cd2a0395ba5de
+Subproject 43a65b661f54755eb725e25112d62cb5eb726ac
diff --git a/qttools b/qttools
-Subproject 709c4a9c065a2a96f601c99374d7ce555226749
+Subproject 54e8925e0997bb4606e4b5491d2d8e446db401c
diff --git a/qtwayland b/qtwayland
-Subproject 16a98829a664403f2fb8962884701f5d4d31cac
+Subproject 4a328e3533f93ed65f9dc77f764b3cbe3c69426
diff --git a/qtwebengine b/qtwebengine
-Subproject f2ddde5793d36b6a6d20fb5d1deb983eda5f610
+Subproject e77ed6f1686dab1852106d2ffa5f74e7526dbce
diff --git a/qtwebglplugin b/qtwebglplugin
-Subproject c320888ff64d81e5e291eb5db683b000b9fe59a
+Subproject e14f45692d5a0ffc15bfd3b85e4fd31d7e578d3
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject e08f9393acc6417598f328d7f4b7b082c5d57af
+Subproject 7df0037316cc2efa7ac082231b72a3fe5dcdfe8
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 03:18:28 +0000