mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-17 20:36:44 +08:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
adf7bcc0b1 | ||
|
|
d216c70d07 | ||
|
|
a5a1899f04 | ||
|
|
75cf7131d6 | ||
|
|
683bb7e19e | ||
|
|
f404267506 |
124
.gitmodules
vendored
124
.gitmodules
vendored
@@ -1,66 +1,66 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg qtxmlpatterns
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt qtwebkit
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -74,7 +74,7 @@
|
||||
recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
|
||||
path = qtwebkit
|
||||
url = ../qtwebkit.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = obsolete
|
||||
project = WebKit.pro
|
||||
priority = 20
|
||||
@@ -82,7 +82,7 @@
|
||||
depends = qtwebkit qttools
|
||||
path = qtwebkit-examples
|
||||
url = ../qtwebkit-examples.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = obsolete
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
@@ -96,21 +96,21 @@
|
||||
recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = 5.7
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
@@ -129,184 +129,142 @@
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = 5.7
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtdeclarative qtimageformats
|
||||
recommends = qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
branch = 5.6.1
|
||||
status = preview
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtquick1"]
|
||||
depends = qtscript
|
||||
recommends = qtsvg qtxmlpatterns
|
||||
path = qtquick1
|
||||
url = ../qtquick1.git
|
||||
branch = 5.7.0
|
||||
status = ignore
|
||||
branch = 5.6.1
|
||||
status = obsolete
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = essential
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = preview
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtenginio"]
|
||||
depends = qtdeclarative
|
||||
path = qtenginio
|
||||
url = ../qtenginio.git
|
||||
branch = 5.7.0
|
||||
status = ignore
|
||||
branch = 5.6.1
|
||||
status = deprecated
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtquickcontrols qtwebchannel
|
||||
recommends = qtlocation
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 5.7.0
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
depends = qtquickcontrols
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
branch = 5.6.1
|
||||
status = preview
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.7.0
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad
|
||||
branch = 5.7.0
|
||||
status = preview
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml
|
||||
branch = 5.7.0
|
||||
status = preview
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech
|
||||
branch = dev
|
||||
status = ignore
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
#!/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2016 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the test suite 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y libboost-dev libboost-thread-dev libboost-system-dev libboost-program-options-dev libboost-filesystem-dev libxml2-dev libboost-regex-dev
|
||||
|
||||
TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
|
||||
trap "sudo rm -fr $TEMPDIR" EXIT
|
||||
cd $TEMPDIR
|
||||
git clone https://github.com/FreeOpcUa/freeopcua.git freeopcua
|
||||
cd freeopcua
|
||||
git checkout 57b6993d39b6761af773fa4fa37c3fbd39c764f1
|
||||
mkdir build
|
||||
cd build
|
||||
cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ..
|
||||
make
|
||||
sudo make install
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: eb3fed53f7...2270fae50f
Submodule qtactiveqt updated: d8d626498c...a466d724e5
Submodule qtandroidextras updated: c47369eab6...0e10177313
2
qtbase
2
qtbase
Submodule qtbase updated: 6c1e352803...540978288e
Submodule qtcanvas3d updated: 5f4845dbaa...72312730a7
1
qtcharts
1
qtcharts
Submodule qtcharts deleted from 0464d42b10
Submodule qtconnectivity updated: 344583c399...7393531856
Submodule qtdatavis3d deleted from 643a6ad187
Submodule qtdeclarative updated: 210617de78...18e77550f1
2
qtdoc
2
qtdoc
Submodule qtdoc updated: de0e539c44...f63dd18eab
Submodule qtenginio updated: 0f6e294fb8...d23fb94863
Submodule qtgamepad deleted from 0295c81fdf
Submodule qtgraphicaleffects updated: 55c13afa51...d01a936b64
Submodule qtimageformats updated: 627666095f...cbf2d7e769
Submodule qtlocation updated: f185e71635...2bdeea2860
Submodule qtmacextras updated: 92faf5240f...98948ff885
Submodule qtmultimedia updated: 8a2c5887cc...711efc552d
Submodule qtpurchasing updated: 60af17f3ab...b5c6c76fac
2
qtquick1
2
qtquick1
Submodule qtquick1 updated: 26229cfa0b...dbc9131ebb
Submodule qtquickcontrols updated: b5a8306bf6...fcc9c02064
Submodule qtquickcontrols2 updated: 6b0fc95d09...6ea6881ec8
2
qtscript
2
qtscript
Submodule qtscript updated: e2e7b57a5d...fc9407affb
1
qtscxml
1
qtscxml
Submodule qtscxml deleted from 05e6410385
Submodule qtsensors updated: ea21a76606...b08c3e69e3
Submodule qtserialbus updated: f9201ca7ba...ec7b4b2268
Submodule qtserialport updated: 9b19e9ce6c...c1355ae41e
1
qtspeech
1
qtspeech
Submodule qtspeech deleted from ca8768b90c
2
qtsvg
2
qtsvg
Submodule qtsvg updated: d39db072e4...0e69a7c86f
2
qttools
2
qttools
Submodule qttools updated: 4c1d5c0416...2d838dd06e
Submodule qttranslations updated: 8ac63b28c4...efa6513bbf
Submodule qtvirtualkeyboard deleted from 5e45faaf05
Submodule qtwayland updated: e0186e0090...920387296a
Submodule qtwebchannel updated: 23cd16ad67...b06c69533b
Submodule qtwebengine updated: a833bc8e4e...6935142841
2
qtwebkit
2
qtwebkit
Submodule qtwebkit updated: 01fa9be555...b889f46028
Submodule qtwebkit-examples updated: f3f9e2a1b7...2050389a34
Submodule qtwebsockets updated: e7ba0d8e24...0637eb3f40
Submodule qtwebview updated: e6a0bd8295...6d13d430ae
Submodule qtwinextras updated: 9bec22cb68...e47b073a8a
Submodule qtx11extras updated: 7163595b9a...f27489d66c
Submodule qtxmlpatterns updated: 8fdcecab85...23b764d347
Reference in New Issue
Block a user