aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules84
m---------qt3d0
m---------qtactiveqt0
m---------qtandroidextras0
m---------qtbase0
m---------qtcharts0
m---------qtconnectivity0
m---------qtdatavis3d0
m---------qtdeclarative0
m---------qtdoc0
m---------qtgamepad0
m---------qtgraphicaleffects0
m---------qtimageformats0
m---------qtlocation0
m---------qtlottie0
m---------qtmacextras0
m---------qtmultimedia0
m---------qtnetworkauth0
m---------qtpurchasing0
m---------qtqa0
m---------qtquickcontrols0
m---------qtquickcontrols20
m---------qtquicktimeline0
m---------qtremoteobjects0
m---------qtrepotools0
m---------qtscript0
m---------qtscxml0
m---------qtsensors0
m---------qtserialbus0
m---------qtserialport0
m---------qtspeech0
m---------qtsvg0
m---------qttools0
m---------qttranslations0
m---------qtvirtualkeyboard0
m---------qtwayland0
m---------qtwebchannel0
m---------qtwebengine0
m---------qtwebglplugin0
m---------qtwebsockets0
m---------qtwebview0
m---------qtwinextras0
m---------qtx11extras0
m---------qtxmlpatterns0
44 files changed, 42 insertions, 42 deletions
diff --git a/.gitmodules b/.gitmodules
index 8f6d9eaf..ef01576e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,60 +1,60 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
- branch = wip/qt6
+ branch = dev
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
- branch = wip/qt6
+ branch = dev
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
- branch = wip/qt6
+ branch = dev
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
- branch = wip/qt6
+ branch = dev
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
- branch = wip/qt6
+ branch = dev
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
- branch = wip/qt6
+ branch = dev
status = deprecated
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
- branch = wip/qt6
+ branch = dev
status = essential
priority = 30
[submodule "qtdoc"]
@@ -62,7 +62,7 @@
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
path = qtdoc
url = ../qtdoc.git
- branch = wip/qt6
+ branch = dev
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -83,14 +83,14 @@
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation
url = ../qtlocation.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -123,99 +123,99 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtserialbus"]
depends = qtbase
recommends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
path = qtwebengine
url = ../qtwebengine.git
- branch = wip/qt6
+ branch = dev
status = addon
priority = 10
[submodule "qtcanvas3d"]
@@ -229,98 +229,98 @@
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
- branch = wip/qt6
+ branch = dev
status = essential
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtpurchasing
url = ../qtpurchasing.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
- branch = wip/qt6
+ branch = dev
status = addon
[submodule "qtlottie"]
depends = qtbase qtdeclarative
path = qtlottie
url = ../qtlottie.git
- branch = wip/qt6
+ branch = dev
status = preview
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
- branch = wip/qt6
+ branch = dev
status = preview
[submodule "qtquick3d"]
depends = qtbase qtdeclarative
path = qtquick3d
url = ../qtquick3d.git
branch = dev
- status = ignore
+ status = preview
diff --git a/qt3d b/qt3d
-Subproject 336e0eb1bc21215012f56f725ebbfb5710d2281
+Subproject 67f7a83d935539e185b4bf26e7c1c79e254497a
diff --git a/qtactiveqt b/qtactiveqt
-Subproject 62ed66bce6e6602d82f9474a8589a7dabd7bc9c
+Subproject 855c01603e19a78cb73421d4a5c2410c4ad31c3
diff --git a/qtandroidextras b/qtandroidextras
-Subproject d5709763486bab11b545000df90b2b79fa5acdd
+Subproject 9ee2af5485f02cbd4cd88cc02ab147f830007a7
diff --git a/qtbase b/qtbase
-Subproject 6132260da394a9627947f0fe6a279c20863b6ad
+Subproject bf8fcab8bb92ff534c5cec048d6dbebb3b73a34
diff --git a/qtcharts b/qtcharts
-Subproject 1c361fe93ea27706928047b8e4e4b2d9aea174f
+Subproject a5d54eb0efd0155174e6b69bb6c4c069d20e99f
diff --git a/qtconnectivity b/qtconnectivity
-Subproject eda28d82e239c57533e73be622b26a3985fb86c
+Subproject 75bb24bf9efc771d8462a3ee69ace6b398f8515
diff --git a/qtdatavis3d b/qtdatavis3d
-Subproject c4c7a35ea5d8faee7e315d26a2251ac02ffef10
+Subproject a54a5a253fce25d0ffa215996a3cdf2fca8b06b
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 9e32b23a1514f367921b4a9ee25bc864a008463
+Subproject bdf0a46c289298f7378796d62ae5fb283e08657
diff --git a/qtdoc b/qtdoc
-Subproject 4813f21919eb8b240f4b8c704b9298ac5e1d073
+Subproject c3a3c01c7f4df8cbdcf328cfb76f530c90f4281
diff --git a/qtgamepad b/qtgamepad
-Subproject c6caf0b09b934c03a11c1b97df8e453875332f7
+Subproject 301af00942b710d8157a916907e2c8324f2502c
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject 433dd81e28ea86f2790a6eadccb73609feaa475
+Subproject 446eb21ff4a6787169c9ef4f9e9ebd531ce58c7
diff --git a/qtimageformats b/qtimageformats
-Subproject 657f6d3c125d852c25c1233f473782eb81e03ab
+Subproject e6ab94c607d8bc078e3d6ba776aa2b69a144846
diff --git a/qtlocation b/qtlocation
-Subproject 31eada8ecaabb1a969f315fe46d35971f61c6e8
+Subproject 2b743cdca353f84959dac47e4ca24615c6f1830
diff --git a/qtlottie b/qtlottie
-Subproject afb6ddb79c573c205ecffeccf9000132f566700
+Subproject 5891e5d7f5b1134a184fb82926c10866257f1f6
diff --git a/qtmacextras b/qtmacextras
-Subproject 850602bb38337060ed31c1a8bbcff6eb195ffcc
+Subproject d1c4e8d6e4dd6200e9c3371e43b63e18911a9cc
diff --git a/qtmultimedia b/qtmultimedia
-Subproject 64ddd6a4f57f4579bfd0eab91dc0f433c3a9f5f
+Subproject 18e6110dfdfd62cc0032f8e43586d075f15299f
diff --git a/qtnetworkauth b/qtnetworkauth
-Subproject 4655361d2fe804d725646a2a45e0a1bc7a44c1d
+Subproject 2b5e2bf759946d3c3f3eddafc4092338b05923a
diff --git a/qtpurchasing b/qtpurchasing
-Subproject 0a627f674d607a496703d1f33cb8cfe68a76ff2
+Subproject 689db87975134dc7332cf32ce2afe96d8a5211a
diff --git a/qtqa b/qtqa
-Subproject 5f9ea5ce0af3cd93a5a57cbda9314996c96c0cd
+Subproject 3cbc0456a5c238c755e47c49ee4b047836eae5e
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject 1987f30831954ce05b6d7908b4866999b2d9b18
+Subproject 61463e781f1892f11a45f9c924aa9b5dbbb359f
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject 341ace84485ffb3c2f05818e1b95604849217c9
+Subproject 72149cbb6fe7b1e6af4018c945ece738f8ad0a1
diff --git a/qtquicktimeline b/qtquicktimeline
-Subproject c9e240bc24e276bbe79c0cf0c7ee8ea3aab5962
+Subproject 5651ee826fa129f5d893ee280d83c1cf2aa7eb2
diff --git a/qtremoteobjects b/qtremoteobjects
-Subproject 4f943eda910e3f7864cc0ca44113ae017fa5f92
+Subproject a23672bad7e28cc0b9c573ad6909e15a4639065
diff --git a/qtrepotools b/qtrepotools
-Subproject 64abf60ae196bd3ad59531f48d2e2c78efa5987
+Subproject 37df2fd634feac3458c19b8a37a44a36f8e3a72
diff --git a/qtscript b/qtscript
-Subproject 593ee850821dbe9eb7ff139eb2485d814694ca8
+Subproject 19a5026113c88ed1be83ed7c18f56c19daeea8d
diff --git a/qtscxml b/qtscxml
-Subproject b5daa31da99fbe872b4df047f37da17ae2c119c
+Subproject 1b555247e953d9be2b442f281698df475ad9fff
diff --git a/qtsensors b/qtsensors
-Subproject bcc717b9ff5e9832794171217436029479b50f8
+Subproject 3935d25914a98615ef1e857efb568da1c6db1ef
diff --git a/qtserialbus b/qtserialbus
-Subproject 9df66161c57e7bee405fff37dfa034f77c25485
+Subproject d59e2a4b72154b64e1d26fd1068933b8a25da77
diff --git a/qtserialport b/qtserialport
-Subproject fc7d7799b279d2c1fc2019966604f04e3621847
+Subproject cb8cf3e7fd7a4ea39c25057c59888112e342ee6
diff --git a/qtspeech b/qtspeech
-Subproject b80e22cd1e79a3a09e69261bcb38497bfe9634f
+Subproject bcca555e7227a0e651dd27dcb61bb5ae0f0b9c6
diff --git a/qtsvg b/qtsvg
-Subproject 24a7b41822333f33c2ec5027795e265a5ad0d35
+Subproject 7831afe0d496794cdc7a7ffbf1b374120941c3e
diff --git a/qttools b/qttools
-Subproject f3d047af903801d9e7705816df5299c4e04a76f
+Subproject cbb56d8dab2447ce8fda454e6c6cd6938dffacb
diff --git a/qttranslations b/qttranslations
-Subproject e94d85e931ee3704192aa4d42c2bc44f0df47b8
+Subproject ab5af4c676b80a69e0f1b8459d4c081a43f6331
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
-Subproject b550d02035516dfcb5a3739aa16efbca0e14392
+Subproject 92404f740116f29866e9f91505d94a2be6dd23e
diff --git a/qtwayland b/qtwayland
-Subproject 3e9fe00c4e4ae4c096a960b4a3b432fca546007
+Subproject fb1f6733b6d98d84f8abd89623c3878ed4a6257
diff --git a/qtwebchannel b/qtwebchannel
-Subproject d87b0adb32e7ed1d897670b59d7ebbb7c504c75
+Subproject 869a1a5f7321dcd3fdd57735fb503a6d3506c61
diff --git a/qtwebengine b/qtwebengine
-Subproject 2f71cdff2cda7903fd0b5ff0033d790877e4018
+Subproject 7268797ab9e32de7497f13ffa9820c49d8cb3e4
diff --git a/qtwebglplugin b/qtwebglplugin
-Subproject 384f551844ddb9ea0042a0894a9dad7a90dd993
+Subproject 5f7bd72592576bb193592702a26a8b0288642a5
diff --git a/qtwebsockets b/qtwebsockets
-Subproject a5b0495ac273bcc841298b52dae3ca9bb608edf
+Subproject 4f29e93b157ed6e4e264297d27a8e1c006e098a
diff --git a/qtwebview b/qtwebview
-Subproject 8bfb710fcdddc0b2649f63588eea6eb389a5453
+Subproject 64f9899781446d73e6ccc42021d4efbd8d1feb8
diff --git a/qtwinextras b/qtwinextras
-Subproject f5bc2b6e6e4985ee113c595abdd1a4bd8b3472f
+Subproject 23fb8fa7d3894d5f93ec5d51461e1366274a0c0
diff --git a/qtx11extras b/qtx11extras
-Subproject 0399b825a1ff7470ed6fd272de8ba74e2be971c
+Subproject 82d4d38d2037ae36b38fe81916b14feb4068972
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject 5c6aaf182f2fa4860f9bdabcc31970769198a81
+Subproject 3101514787f7f3a451514b2ef3fc6e7bcfe1f0c