mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-30 10:26:03 +08:00
Compare commits
12 Commits
v5.8.0-bet
...
v5.7.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bf3d2588cc | ||
|
|
9817f4a84c | ||
|
|
0150c62f60 | ||
|
|
1a6968113c | ||
|
|
c09f683eda | ||
|
|
294ec185e4 | ||
|
|
f5fe555ec7 | ||
|
|
f8bed24b63 | ||
|
|
f2fc36b021 | ||
|
|
0750f2b6ce | ||
|
|
4857e0313f | ||
|
|
1282fa3662 |
97
.gitmodules
vendored
97
.gitmodules
vendored
@@ -1,66 +1,66 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg qtxmlpatterns
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt qtwebkit
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.8
|
||||
branch = 5.7.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.8
|
||||
branch = 5.7
|
||||
status = obsolete
|
||||
project = WebKit.pro
|
||||
priority = 20
|
||||
@@ -82,7 +82,7 @@
|
||||
depends = qtwebkit qttools
|
||||
path = qtwebkit-examples
|
||||
url = ../qtwebkit-examples.git
|
||||
branch = 5.8
|
||||
branch = 5.7
|
||||
status = obsolete
|
||||
[submodule "qtqa"]
|
||||
depends = qtbase
|
||||
@@ -93,17 +93,17 @@
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtquickcontrols qtserialport
|
||||
recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -136,184 +136,177 @@
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtdeclarative qtimageformats
|
||||
recommends = qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtquick1"]
|
||||
depends = qtscript
|
||||
recommends = qtsvg qtxmlpatterns
|
||||
path = qtquick1
|
||||
url = ../qtquick1.git
|
||||
branch = dev
|
||||
branch = 5.7
|
||||
status = ignore
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = essential
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.8
|
||||
status = addon
|
||||
branch = 5.7.1
|
||||
status = preview
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtenginio"]
|
||||
depends = qtdeclarative
|
||||
path = qtenginio
|
||||
url = ../qtenginio.git
|
||||
branch = dev
|
||||
branch = 5.7
|
||||
status = ignore
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtquickcontrols qtwebchannel
|
||||
recommends = qtlocation
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase qtandroidextras
|
||||
recommends = qtdeclarative
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad
|
||||
branch = 5.8
|
||||
branch = 5.7.1
|
||||
status = preview
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml
|
||||
branch = 5.8
|
||||
status = addon
|
||||
branch = 5.7.1
|
||||
status = preview
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech
|
||||
branch = 5.8
|
||||
status = preview
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
recommends = qtwebview
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth
|
||||
branch = 5.8
|
||||
status = preview
|
||||
branch = dev
|
||||
status = ignore
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
#!/bin/env bash
|
||||
# Required for tqtc-boot2qt/qdb
|
||||
sudo yum install -y libusb1-devel
|
||||
@@ -1,5 +0,0 @@
|
||||
# We need to disable selinux while we are overwriting some binaries
|
||||
# required by it. If this is not done, ICU provisioning will create
|
||||
# template that is not booting.
|
||||
|
||||
sudo sed -i s/SELINUX=enforcing/SELINUX=disabled/g /etc/selinux/config
|
||||
@@ -1,70 +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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script installs the right ICU version
|
||||
|
||||
set -e
|
||||
icuVersion="56.1"
|
||||
icuLocation="/usr/lib64"
|
||||
sha1="6dd9ca6b185681a7ddc4bb94fd7fced27647a21c"
|
||||
|
||||
function Install7ZPackageFromURL {
|
||||
url=$1
|
||||
expectedSha1=$2
|
||||
targetDirectory=$3
|
||||
|
||||
targetFile=`mktemp` || echo "Failed to create temporary file"
|
||||
wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times"
|
||||
echo "$expectedSha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
|
||||
sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile || echo "Failed to unzip $url archive"
|
||||
rm $targetFile
|
||||
}
|
||||
|
||||
echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
|
||||
|
||||
baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z"
|
||||
Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64"
|
||||
|
||||
echo "Installing custom ICU devel packages on RHEL"
|
||||
|
||||
sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864"
|
||||
develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z"
|
||||
tempDir=`mktemp -d` || echo "Failed to create temporary directory"
|
||||
trap "sudo rm -fr $tempDir" EXIT
|
||||
Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir
|
||||
sudo cp -a $tempDir/lib/* /usr/lib64
|
||||
sudo cp -a $tempDir/* /usr/
|
||||
|
||||
sudo /sbin/ldconfig
|
||||
@@ -1,9 +0,0 @@
|
||||
# gstreamer 1 for QtMultimedia
|
||||
# gtk3 style for QtGui/QStyle
|
||||
# libusb1 for tqtc-boot2qt/qdb
|
||||
|
||||
sudo yum install -y \
|
||||
gstreamer1-devel gstreamer1-plugins-base-devel \
|
||||
gtk3-devel \
|
||||
libusb1-devel
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
#!/bin/env bash
|
||||
# Required for tqtc-boot2qt/qdb
|
||||
sudo apt-get install -y libusb-1.0-0-dev
|
||||
@@ -1,7 +0,0 @@
|
||||
{
|
||||
"commandline": {
|
||||
"options": {
|
||||
"skip": "addString"
|
||||
}
|
||||
}
|
||||
}
|
||||
31
qt.pro
31
qt.pro
@@ -1,9 +1,11 @@
|
||||
# Create the super cache so modules will add themselves to it.
|
||||
cache(, super)
|
||||
|
||||
TEMPLATE = subdirs
|
||||
CONFIG += build_pass # hack to disable the .qmake.super auto-add
|
||||
load(qt_build_config)
|
||||
CONFIG -= build_pass # unhack, as it confuses Qt Creator
|
||||
|
||||
CONFIG += prepare_docs qt_docs_targets
|
||||
TEMPLATE = subdirs
|
||||
|
||||
# Extract submodules from .gitmodules.
|
||||
lines = $$cat(.gitmodules, lines)
|
||||
@@ -24,29 +26,6 @@ for (line, lines) {
|
||||
}
|
||||
QMAKE_INTERNAL_INCLUDED_FILES += $$PWD/.gitmodules
|
||||
|
||||
QT_SKIP_MODULES =
|
||||
uikit {
|
||||
QT_SKIP_MODULES += qtdoc qtmacextras qtserialport qtwebkit qtwebkit-examples
|
||||
!ios: QT_SKIP_MODULES += qtscript
|
||||
}
|
||||
|
||||
# This is a bit hacky, but a proper implementation is not worth it.
|
||||
args = $$QMAKE_EXTRA_ARGS
|
||||
for (ever) {
|
||||
isEmpty(args): break()
|
||||
a = $$take_first(args)
|
||||
|
||||
equals(a, -skip) {
|
||||
isEmpty(args): break()
|
||||
m = $$take_first(args)
|
||||
contains(m, -.*): next()
|
||||
m ~= s/^(qt)?/qt/
|
||||
!contains(modules, $$m): \
|
||||
error("-skip command line argument used with non-existent module '$$m'.")
|
||||
QT_SKIP_MODULES += $$m
|
||||
}
|
||||
}
|
||||
|
||||
modules = $$sort_depends(modules, module., .depends .recommends)
|
||||
modules = $$reverse(modules)
|
||||
for (mod, modules) {
|
||||
@@ -93,5 +72,3 @@ for (mod, modules) {
|
||||
|
||||
SUBDIRS += $$mod
|
||||
}
|
||||
|
||||
load(qt_configure)
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 6e8e228852...0eac16fbda
Submodule qtactiveqt updated: d72a0b4481...67dcd1a1b5
Submodule qtandroidextras updated: 8bd0a0e521...2622247a0c
2
qtbase
2
qtbase
Submodule qtbase updated: 5a92b6e8be...a55f36211e
Submodule qtcanvas3d updated: 6c5121eab7...8e34d6f539
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 15447eed96...da07182524
Submodule qtconnectivity updated: 515ff5b0f9...d884d20c55
Submodule qtdatavis3d updated: 96086b01a3...2523056490
Submodule qtdeclarative updated: 9d085bf002...2a992040e2
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 17164cd947...79ed30f70c
Submodule qtdocgallery updated: e36e6f0abd...2da36eb615
Submodule qtenginio updated: b0ad5907f4...15090ec536
Submodule qtfeedback updated: 9ac8d8c272...28ca624149
Submodule qtgamepad updated: 095d854f18...e5066759bf
Submodule qtgraphicaleffects updated: 8b5cb6185a...f536e36e31
Submodule qtimageformats updated: 99d9e0c527...11300c62aa
Submodule qtlocation updated: 8aabdb0975...de5be121d8
Submodule qtmacextras updated: 57b5739923...237ad2f2f0
Submodule qtmultimedia updated: 0cb4dc5c1f...e4aef963cb
Submodule qtnetworkauth deleted from 8e49136c1d
2
qtpim
2
qtpim
Submodule qtpim updated: 02efef5ee6...de4cfc6b53
Submodule qtpurchasing updated: 9aa3e78fd1...52910f6a43
2
qtqa
2
qtqa
Submodule qtqa updated: 8c5bc9ede6...cd6bd18319
2
qtquick1
2
qtquick1
Submodule qtquick1 updated: 64faeb0d80...26229cfa0b
Submodule qtquickcontrols updated: 3bc99dd69f...84b3cf1c04
Submodule qtquickcontrols2 updated: e09a859199...6f6e073815
Submodule qtrepotools updated: c38b38d8b6...973462d65b
2
qtscript
2
qtscript
Submodule qtscript updated: 89e980b8e0...42f94f3048
2
qtscxml
2
qtscxml
Submodule qtscxml updated: 44798eeb43...63ec7e2ff9
Submodule qtsensors updated: 8065e46142...5a57beaaa5
Submodule qtserialbus updated: 8e4bd5bcfd...768b2d4636
Submodule qtserialport updated: e2a658a247...0b9f41c28c
2
qtspeech
2
qtspeech
Submodule qtspeech updated: 59a279265f...ca8768b90c
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 5a00abdefd...d3d3db5a75
Submodule qtsystems updated: 434af789f0...cc2077700b
2
qttools
2
qttools
Submodule qttools updated: b8113e90e2...8575ed82ff
Submodule qttranslations updated: 64f3b105fb...c4795ce81f
Submodule qtvirtualkeyboard updated: 947a55149a...5ac6b611b1
Submodule qtwayland updated: 3443483c9e...4b23163fb6
Submodule qtwebchannel updated: bf66a8531e...31eb0d8c7d
Submodule qtwebengine updated: ac3d8780a0...9cc97f0c63
2
qtwebkit
2
qtwebkit
Submodule qtwebkit updated: 431520f150...b9ce7cfc7f
Submodule qtwebkit-examples updated: 1a839b5056...1ac4ee2402
Submodule qtwebsockets updated: ccb1385483...60cede232a
Submodule qtwebview updated: fdf3a401b7...61c2a76cf0
Submodule qtwinextras updated: 13604e3fcc...2242619275
Submodule qtx11extras updated: 0f91218091...d311bf931b
Submodule qtxmlpatterns updated: 977d0fb3f0...89dbcc4f80
Reference in New Issue
Block a user