mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-30 18:35:59 +08:00
Compare commits
6 Commits
v5.8.0-alp
...
v5.6.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
adf7bcc0b1 | ||
|
|
d216c70d07 | ||
|
|
a5a1899f04 | ||
|
|
75cf7131d6 | ||
|
|
683bb7e19e | ||
|
|
f404267506 |
135
.gitmodules
vendored
135
.gitmodules
vendored
@@ -1,66 +1,66 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg qtxmlpatterns
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt qtwebkit
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.8
|
||||
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.8
|
||||
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.8
|
||||
branch = 5.6.1
|
||||
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.6.1
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -136,184 +136,135 @@
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtdeclarative qtimageformats
|
||||
recommends = qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.8
|
||||
status = addon
|
||||
branch = 5.6.1
|
||||
status = preview
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtquick1"]
|
||||
depends = qtscript
|
||||
recommends = qtsvg qtxmlpatterns
|
||||
path = qtquick1
|
||||
url = ../qtquick1.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
branch = 5.6.1
|
||||
status = obsolete
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = essential
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.8
|
||||
status = addon
|
||||
branch = 5.6.1
|
||||
status = preview
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtenginio"]
|
||||
depends = qtdeclarative
|
||||
path = qtenginio
|
||||
url = ../qtenginio.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
branch = 5.6.1
|
||||
status = deprecated
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtquickcontrols qtwebchannel
|
||||
recommends = qtlocation
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 5.8
|
||||
branch = 5.6.1
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
depends = qtquickcontrols
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.8
|
||||
status = addon
|
||||
branch = 5.6.1
|
||||
status = preview
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.8
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.8
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.8
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.8
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad
|
||||
branch = 5.8
|
||||
status = preview
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml
|
||||
branch = 5.8
|
||||
status = addon
|
||||
[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
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
|
||||
Contact: http://www.qt.io/licensing/
|
||||
|
||||
You may use, distribute and copy the Qt Toolkit under the terms of
|
||||
You may use, distribute and copy the Qt GUI Toolkit under the terms of
|
||||
GNU General Public License version 2, which is displayed below.
|
||||
|
||||
-------------------------------------------------------------------------
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
|
||||
Contact: http://www.qt.io/licensing/
|
||||
|
||||
You may use, distribute and copy the Qt Toolkit under the terms of
|
||||
You may use, distribute and copy the Qt GUI Toolkit under the terms of
|
||||
GNU Lesser General Public License version 3. That license references
|
||||
the General Public License version 3, that is displayed below. Other
|
||||
portions of the Qt Toolkit may be licensed directly under this license.
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
|
||||
Contact: http://www.qt.io/licensing/
|
||||
|
||||
You may use, distribute and copy the Qt Toolkit under the terms of
|
||||
You may use, distribute and copy the Qt GUI Toolkit under the terms of
|
||||
GNU Lesser General Public License version 2.1, which is displayed below.
|
||||
|
||||
-------------------------------------------------------------------------
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
|
||||
Contact: http://www.qt.io/licensing/
|
||||
|
||||
You may use, distribute and copy the Qt Toolkit under the terms of
|
||||
You may use, distribute and copy the Qt GUI Toolkit under the terms of
|
||||
GNU Lesser General Public License version 3, which is displayed below.
|
||||
This license makes reference to the version 3 of the GNU General
|
||||
Public License, which you can find in the LICENSE.GPLv3 file.
|
||||
|
||||
37
README
37
README
@@ -10,12 +10,35 @@ HOW TO BUILD QT5
|
||||
|
||||
- Perl 5.8 or later
|
||||
- Python 2.7 or later
|
||||
- C++ compiler supporting the C++11 standard
|
||||
- C++ compiler supporting the C++98 standard
|
||||
|
||||
For other platform specific requirements,
|
||||
please see section "Setting up your machine" on:
|
||||
http://wiki.qt.io/Get_The_Source
|
||||
|
||||
Optional requirements
|
||||
---------------------
|
||||
|
||||
- OpenSSL for SSL sockets or HTTPS
|
||||
- Wayland
|
||||
|
||||
New dependencies in Qt 5
|
||||
------------------------
|
||||
|
||||
Linux: On systems running X11, the XCB libraries are required for
|
||||
the platform plugin to build. qtbase/src/plugins/platforms/xcb/README
|
||||
lists the required packages.
|
||||
|
||||
Qt 5 can make use of the ICU libraries providing Unicode and Globalization
|
||||
support (see http://site.icu-project.org/). They are required for building
|
||||
QtWebKit.
|
||||
On Linux, they will be auto-detected.
|
||||
On Windows, they need to be manually installed and the "include" and "lib"
|
||||
folders of the ICU installation must be appended to the INCLUDE and LIB
|
||||
environment variables after calling the Windows SDK setup script.
|
||||
The "bin" folder of the ICU installation should be appended to the PATH
|
||||
environment variable in order to for the DLLs to be found at run-time.
|
||||
|
||||
Licensing:
|
||||
----------
|
||||
|
||||
@@ -39,10 +62,8 @@ HOW TO BUILD QT5
|
||||
Windows:
|
||||
--------
|
||||
|
||||
Open a command prompt.
|
||||
Ensure that the following tools can be found in the path:
|
||||
* Supported compiler (Visual Studio 2012 or later,
|
||||
MinGW-builds gcc 4.9 or later)
|
||||
Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that the
|
||||
following tools can be found in the path:
|
||||
* Perl version 5.12 or later [http://www.activestate.com/activeperl/]
|
||||
* Python version 2.7 or later [http://www.activestate.com/activepython/]
|
||||
* Ruby version 1.9.3 or later [http://rubyinstaller.org/]
|
||||
@@ -89,11 +110,11 @@ HOW TO BUILD QT5
|
||||
default in the build system.
|
||||
|
||||
It is possible to build selected modules with their dependencies by doing
|
||||
a `make module-<foo>'. For example, to build only qtdeclarative,
|
||||
and the modules it depends on:
|
||||
a `make module-<foo>'. For example, to build only qtscript and qtwebkit,
|
||||
and the modules they depend on:
|
||||
|
||||
./configure -prefix $PWD/qtbase <license>
|
||||
make -j4 module-qtdeclarative
|
||||
make -j4 module-qtscript module-qtwebkit
|
||||
|
||||
This can save a lot of time if you are only interested in a subset of Qt5.
|
||||
|
||||
|
||||
@@ -6,6 +6,4 @@ This directory contains files used by Qt's Continuous Integration system (Coin).
|
||||
provisioning
|
||||
------------
|
||||
Contains scripts that apply to different test machines in order to run automatic tests on them.
|
||||
For Windows scripts, make sure that the machine has "Set-ExecutionPolicy RemoteSigned -Force" set.
|
||||
(Run as admin in PowerShell)
|
||||
|
||||
|
||||
@@ -27,5 +27,5 @@ function Extract-Zip
|
||||
$shell = new-object -com shell.application
|
||||
$zipfile = $shell.Namespace($Source)
|
||||
$destinationFolder = $shell.Namespace($Destination)
|
||||
$destinationFolder.CopyHere($zipfile.Items(), 16)
|
||||
$destinationFolder.CopyHere($zipfile.Items())
|
||||
}
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
# ICU is already pre-installed on Windows machines, it would be nice to have
|
||||
# the installation script, but for now let's just export the right variables
|
||||
|
||||
# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
|
||||
[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine")
|
||||
|
||||
# FIXME: do we really want to use the 4.8.2 ICU build?
|
||||
[Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine")
|
||||
@@ -5,5 +5,3 @@ $zip = "c:\users\qt\downloads\jom_1_1_0.zip"
|
||||
Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_0.zip -OutFile $zip
|
||||
Verify-Checksum $zip "C4149FE706B25738B4C4E54C73E180B9CAB55832"
|
||||
Extract-Zip $zip C:\Utils\Jom
|
||||
|
||||
[Environment]::SetEnvironmentVariable("CI_JOM_PATH", "C:\Utils\Jom", "Machine")
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
#############################################################################
|
||||
##
|
||||
## 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# Patch QNX SDK due to issues in the standard library.
|
||||
# The patches are available here:
|
||||
# http://www.qnx.com/download/feature.html?programid=27555
|
||||
# A copy of the patch must be in the root of the Coin path in
|
||||
# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
|
||||
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip"
|
||||
$sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565"
|
||||
$tempDir = "C:\temp\qnx_path"
|
||||
|
||||
Invoke-WebRequest -UseBasicParsing http://${Env:COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip
|
||||
Verify-Checksum $zip $sha1
|
||||
Extract-Zip $zip $tempDir
|
||||
Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force
|
||||
Remove-Item $tempDir -recurse
|
||||
@@ -1,6 +0,0 @@
|
||||
# provides: fix for possible bug in the subscription manager
|
||||
# version: provided by RedHat
|
||||
# needed for yum to work properly in case there is incorrect data in
|
||||
# the sslclientkey repository parameter value
|
||||
sudo rm -f /etc/pki/entitlement/*
|
||||
sudo subscription-manager refresh
|
||||
@@ -1,64 +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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# Patch QNX SDK due to issues in the standard library.
|
||||
# The patches are available here:
|
||||
# http://www.qnx.com/download/feature.html?programid=27555
|
||||
# A copy of the patch must be in the root of the Coin path in
|
||||
# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
|
||||
|
||||
set -e
|
||||
sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565"
|
||||
|
||||
function InstallZipPackageFromURL {
|
||||
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"
|
||||
|
||||
tempDir=`mktemp -d` || echo "Failed to create temporary directory"
|
||||
/usr/bin/unzip -o -d $tempDir $targetFile || echo "Failed to unzip $url archive"
|
||||
trap "sudo rm -fr $targetFile $tempDir" EXIT
|
||||
|
||||
sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/
|
||||
}
|
||||
|
||||
echo "Patching QNX"
|
||||
|
||||
baseBinaryPackageURL="http://${COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip"
|
||||
InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/"
|
||||
@@ -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
|
||||
@@ -1,2 +0,0 @@
|
||||
#!/bin/sh
|
||||
defaults write com.apple.CrashReporter DialogType server
|
||||
@@ -1,2 +0,0 @@
|
||||
#!/bin/sh
|
||||
defaults write com.apple.CrashReporter DialogType server
|
||||
@@ -1,2 +0,0 @@
|
||||
#!/bin/sh
|
||||
defaults write com.apple.CrashReporter DialogType server
|
||||
@@ -1,2 +0,0 @@
|
||||
#!/bin/sh
|
||||
defaults write com.apple.CrashReporter DialogType server
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\icu.ps1"
|
||||
@@ -1 +1,6 @@
|
||||
Set-ExecutionPolicy RemoteSigned -Force
|
||||
|
||||
# install jom
|
||||
. "$PSScriptRoot\..\common\jom.ps1"
|
||||
|
||||
Set-ExecutionPolicy Restricted -Force
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\icu.ps1"
|
||||
@@ -1 +1,6 @@
|
||||
Set-ExecutionPolicy RemoteSigned -Force
|
||||
|
||||
# install jom
|
||||
. "$PSScriptRoot\..\common\jom.ps1"
|
||||
|
||||
Set-ExecutionPolicy Restricted -Force
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\icu.ps1"
|
||||
@@ -1 +1,6 @@
|
||||
Set-ExecutionPolicy RemoteSigned -Force
|
||||
|
||||
# install jom
|
||||
. "$PSScriptRoot\..\common\jom.ps1"
|
||||
|
||||
Set-ExecutionPolicy Restricted -Force
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\patch_qnx.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\icu.ps1"
|
||||
@@ -1 +1,6 @@
|
||||
Set-ExecutionPolicy RemoteSigned -Force
|
||||
|
||||
# install jom
|
||||
. "$PSScriptRoot\..\common\jom.ps1"
|
||||
|
||||
Set-ExecutionPolicy Restricted -Force
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\icu.ps1"
|
||||
@@ -1 +1,6 @@
|
||||
Set-ExecutionPolicy RemoteSigned -Force
|
||||
|
||||
# install jom
|
||||
. "$PSScriptRoot\..\common\jom.ps1"
|
||||
|
||||
Set-ExecutionPolicy Restricted -Force
|
||||
|
||||
@@ -155,10 +155,9 @@ EOF
|
||||
}
|
||||
|
||||
use Carp qw( confess );
|
||||
use Cwd qw( getcwd abs_path );
|
||||
use English qw( -no_match_vars );
|
||||
use File::Spec::Functions qw ( rel2abs );
|
||||
use Getopt::Long qw( GetOptions );
|
||||
use Cwd qw( getcwd abs_path );
|
||||
|
||||
my $script_path = abs_path($0);
|
||||
$script_path =~ s,[/\\][^/\\]+$,,;
|
||||
@@ -559,25 +558,24 @@ sub git_install_hooks
|
||||
my @configresult = qx(git config --list --local);
|
||||
foreach my $line (@configresult) {
|
||||
next if ($line !~ /submodule\.([^.=]+)\.url=/);
|
||||
my $module = $1;
|
||||
my $module_gitdir = $module.'/.git';
|
||||
if (!-d $module_gitdir) {
|
||||
open GITD, $module_gitdir or die "Cannot open $module: $!\n";
|
||||
my $module = $1.'/.git';
|
||||
if (!-d $module) {
|
||||
open GITD, $module or die "Cannot open $module: $!\n";
|
||||
my $gd = <GITD>;
|
||||
close GITD;
|
||||
chomp($gd);
|
||||
$gd =~ s/^gitdir: // or die "Malformed .git file $module_gitdir\n";
|
||||
$module_gitdir = rel2abs($gd, $module);
|
||||
if (open COMD, $module_gitdir.'/commondir') {
|
||||
$gd =~ s/^gitdir: // or die "Malformed .git file $module\n";
|
||||
$module = $gd; # We expect it to be always absolute.
|
||||
if (open COMD, $module.'/commondir') {
|
||||
my $cd = <COMD>;
|
||||
chomp($cd);
|
||||
$module_gitdir .= '/'.$cd;
|
||||
$module_gitdir = abs_path($module_gitdir);
|
||||
$module .= '/'.$cd;
|
||||
$module = abs_path($module);
|
||||
close COMD;
|
||||
}
|
||||
}
|
||||
$self->ensure_link($hooks.'/gerrit_commit_msg_hook', $module_gitdir.'/hooks/commit-msg');
|
||||
$self->ensure_link($hooks.'/git_post_commit_hook', $module_gitdir.'/hooks/post-commit');
|
||||
$self->ensure_link($hooks.'/gerrit_commit_msg_hook', $module.'/hooks/commit-msg');
|
||||
$self->ensure_link($hooks.'/git_post_commit_hook', $module.'/hooks/post-commit');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 5688464a38...2270fae50f
Submodule qtactiveqt updated: 45cd9f66f4...a466d724e5
Submodule qtandroidextras updated: c944c05ca4...0e10177313
2
qtbase
2
qtbase
Submodule qtbase updated: 982f17e961...540978288e
Submodule qtcanvas3d updated: a04083615e...72312730a7
1
qtcharts
1
qtcharts
Submodule qtcharts deleted from 1444743488
Submodule qtconnectivity updated: ee177fa9cd...7393531856
Submodule qtdatavis3d deleted from b6c5569f21
Submodule qtdeclarative updated: c13aa48d4c...18e77550f1
2
qtdoc
2
qtdoc
Submodule qtdoc updated: cb23e64e86...f63dd18eab
Submodule qtdocgallery updated: e36e6f0abd...2da36eb615
Submodule qtenginio updated: b0ad5907f4...d23fb94863
Submodule qtfeedback updated: 9ac8d8c272...28ca624149
Submodule qtgamepad deleted from f4bd1e2687
Submodule qtgraphicaleffects updated: 8b5cb6185a...d01a936b64
Submodule qtimageformats updated: d3ac5245d0...cbf2d7e769
Submodule qtlocation updated: d999495a01...2bdeea2860
Submodule qtmacextras updated: e0e5a57430...98948ff885
Submodule qtmultimedia updated: 29232a2bc2...711efc552d
Submodule qtnetworkauth deleted from 0cb5de9c28
2
qtpim
2
qtpim
Submodule qtpim updated: 02efef5ee6...de4cfc6b53
Submodule qtpurchasing updated: 4aa95af070...b5c6c76fac
2
qtqa
2
qtqa
Submodule qtqa updated: 1c973844b7...32893be6fa
2
qtquick1
2
qtquick1
Submodule qtquick1 updated: 92c847e56d...dbc9131ebb
Submodule qtquickcontrols updated: e516c88c48...fcc9c02064
Submodule qtquickcontrols2 updated: 67f67f2cc6...6ea6881ec8
Submodule qtrepotools updated: 471da8d402...be3d47ae95
2
qtscript
2
qtscript
Submodule qtscript updated: 059fc10f8f...fc9407affb
1
qtscxml
1
qtscxml
Submodule qtscxml deleted from 90b000155e
Submodule qtsensors updated: 0032fd6150...b08c3e69e3
Submodule qtserialbus updated: fa54696446...ec7b4b2268
Submodule qtserialport updated: df8d69c000...c1355ae41e
1
qtspeech
1
qtspeech
Submodule qtspeech deleted from 577060af2d
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 4c44cffd7b...0e69a7c86f
Submodule qtsystems updated: 434af789f0...cc2077700b
2
qttools
2
qttools
Submodule qttools updated: 89d766d653...2d838dd06e
Submodule qttranslations updated: 64f3b105fb...efa6513bbf
Submodule qtvirtualkeyboard deleted from 2d9cb8747c
Submodule qtwayland updated: b0c416dede...920387296a
Submodule qtwebchannel updated: bf66a8531e...b06c69533b
Submodule qtwebengine updated: 9cda8d4384...6935142841
2
qtwebkit
2
qtwebkit
Submodule qtwebkit updated: 5b94fe36c9...b889f46028
Submodule qtwebkit-examples updated: 1a839b5056...2050389a34
Submodule qtwebsockets updated: 94a1fe0b12...0637eb3f40
Submodule qtwebview updated: c403171094...6d13d430ae
Submodule qtwinextras updated: 3393a78af1...e47b073a8a
Submodule qtx11extras updated: 6143e155ad...f27489d66c
Submodule qtxmlpatterns updated: 0171940a53...23b764d347
Reference in New Issue
Block a user