diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-06 06:20:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-06 06:20:21 +0200 |
| commit | 23f5d41becdc607b4ed09dd0958046eec2a8f8eb (patch) | |
| tree | 75a290f6d4c2d152ef68dde3455c14d11a58b4b3 | |
| parent | 525a85bd6d6618d011e476d9af48bac7d1906520 (diff) | |
| parent | 95ff2f4870a3fce4d3f96c721e9d2868ecea9347 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I91cf0b6132a73c34c63d83a0bee1c028f2f819f8
| -rw-r--r-- | README | 8 | ||||
| -rw-r--r-- | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh | 6 | ||||
| -rw-r--r-- | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh (renamed from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh) | 0 |
3 files changed, 11 insertions, 3 deletions
@@ -10,7 +10,7 @@ HOW TO BUILD QT5 - Perl 5.8 or later - Python 2.7 or later - - C++ compiler supporting the C++98 standard + - C++ compiler supporting the C++11 standard For other platform specific requirements, please see section "Setting up your machine" on: @@ -39,8 +39,10 @@ HOW TO BUILD QT5 Windows: -------- - Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that the - following tools can be found in the path: + 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) * 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/] diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh new file mode 100644 index 00000000..852c1100 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh @@ -0,0 +1,6 @@ +# 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 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh index f6c90a75..f6c90a75 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh |