Merge remote-tracking branch 'origin/5.7' into dev

Change-Id: I91cf0b6132a73c34c63d83a0bee1c028f2f819f8
This commit is contained in:
Liang Qi
2016-08-06 06:20:21 +02:00
3 changed files with 11 additions and 3 deletions

8
README
View File

@@ -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/]

View File

@@ -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