mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-21 23:48:23 +08:00
Compare commits
1 Commits
wip/emulat
...
wip/qt3dst
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
70314ea485 |
80
.gitmodules
vendored
80
.gitmodules
vendored
@@ -1,60 +1,60 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -62,7 +62,7 @@
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -83,14 +83,14 @@
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -123,185 +123,185 @@
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 5.12.9
|
||||
branch = 5.12.8
|
||||
status = addon
|
||||
|
||||
@@ -1,21 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
|
||||
# Will install homebrew package manager for macOS.
|
||||
# WARNING: Requires commandlinetools
|
||||
|
||||
|
||||
set -e
|
||||
|
||||
. "$(dirname "$0")"/../../common/unix/DownloadURL.sh
|
||||
|
||||
|
||||
DownloadURL \
|
||||
http://ci-files01-hki.intra.qt.io/input/mac/homebrew-install.c744a716f9845988d01e6e238eee7117b8c366c9.rb \
|
||||
https://raw.githubusercontent.com/Homebrew/install/c744a716f9845988d01e6e238eee7117b8c366c9/install \
|
||||
b9782cc0b550229de77b429b56ffce04157e60486ab9df00461ccf3dad565b0a \
|
||||
/tmp/homebrew_install
|
||||
/usr/bin/ruby /tmp/homebrew_install </dev/null
|
||||
|
||||
# No need to manually do `brew update`, the homebrew installer script does it.
|
||||
### brew update
|
||||
#!/usr/bin/env bash
|
||||
# Will install homebrew package manager for macOS
|
||||
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" </dev/null
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2020 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at http://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 2.1 or version 3 as published by the Free
|
||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
## following information to ensure the GNU Lesser General Public License
|
||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
##
|
||||
## As a special exception, The Qt Company gives you certain additional
|
||||
## rights. These rights are described in The Qt Company LGPL Exception
|
||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
sudo yum-config-manager --enable rhel-6-workstation-rpms
|
||||
sudo yum-config-manager --enable rhel-6-workstation-optional-rpms
|
||||
sudo yum-config-manager --enable rhel-workstation-rhscl-6-rpms
|
||||
|
||||
sudo yum clean all
|
||||
# As well as this fetching the repository data, we also get a printout of the used repos
|
||||
sudo yum repolist
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/macos/homebrew.sh"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/macos/homebrew.sh"
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: d77a1fbbce...f965d4712a
Submodule qtactiveqt updated: 8567ef9664...ad555db81d
Submodule qtandroidextras updated: 38e989b708...083ab46f4a
2
qtbase
2
qtbase
Submodule qtbase updated: 823ed71e22...08d6cb7673
Submodule qtcanvas3d updated: 344511fe4a...abab2cc31b
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 3d92c71f44...76cf047c29
Submodule qtconnectivity updated: 538cdb99e3...a526644f2f
Submodule qtdatavis3d updated: 5acf942156...6c6a7eb15b
Submodule qtdeclarative updated: 722caf22ad...101799f8ac
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 680ad5b6c2...666831a863
Submodule qtgamepad updated: 47ae6c32de...a047498b16
Submodule qtgraphicaleffects updated: 8bfa0511fa...4cab303c83
Submodule qtimageformats updated: 9dda3ab214...6c75b54d33
Submodule qtlocation updated: f8d6d316aa...8a7d656a77
Submodule qtmacextras updated: ea1d76d51e...14c9ce986a
Submodule qtmultimedia updated: 45fb451024...194b584ca1
Submodule qtnetworkauth updated: 8015b204c6...a282f5d493
Submodule qtpurchasing updated: 9b7dc6a2c2...2191ec56a3
2
qtqa
2
qtqa
Submodule qtqa updated: 97c9a2605c...af377a3310
Submodule qtquickcontrols updated: ce10dfef0d...4687a1dbef
Submodule qtquickcontrols2 updated: d112da7427...3c7be4a991
Submodule qtremoteobjects updated: b78d0b880a...e978116774
Submodule qtrepotools updated: 050705f615...fbe6d232ba
2
qtscript
2
qtscript
Submodule qtscript updated: 47ad08af44...98e65d3511
2
qtscxml
2
qtscxml
Submodule qtscxml updated: eeab4442d4...5b97c163b3
Submodule qtsensors updated: e3d4c6654f...37fa5756b0
Submodule qtserialbus updated: 326fd0669d...4a47ea4e53
Submodule qtserialport updated: 1e3a56904f...c9fd061305
2
qtspeech
2
qtspeech
Submodule qtspeech updated: b76ce09fe0...1cd9809cde
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 6529b001dd...91a4369b99
2
qttools
2
qttools
Submodule qttools updated: 90aa88f31b...64280d563e
Submodule qttranslations updated: b2ceff197a...74d8329bf6
Submodule qtvirtualkeyboard updated: 19abb4ba2e...0c71f71a28
Submodule qtwayland updated: 5ca98f0c3f...27c3046fd9
Submodule qtwebchannel updated: 23fd5f70c9...bf986e4111
Submodule qtwebengine updated: a5017ad198...175b8129d1
Submodule qtwebglplugin updated: cdc501d2f1...07074154be
Submodule qtwebsockets updated: 5fa19ba8a0...051a396183
Submodule qtwebview updated: 563c1a80e8...30edb647a6
Submodule qtwinextras updated: 498d1d9af5...c787811c72
Submodule qtx11extras updated: 6979e50d29...40b30b4718
Submodule qtxmlpatterns updated: 712fa2a8b2...9a88ab0974
Reference in New Issue
Block a user