1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a deprecation warning to configure about -no-c++11

Browse Source 
We'll remove it in Qt 5.7, so people ought to be notified now.

Change-Id: Ib056b47dde3341ef9a52ffff13ef6caa91757a9f
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
This commit is contained in:
Thiago Macieira 2015-07-09 16:58:05 -07:00
parent b58fc66ed7
commit 27361eadf1
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -7497,6 +7497,20 @@ cat <<EOF
EOF
fi
#-------------------------------------------------------------------------------
# check if the user passed the deprecated -no-c++11 / --c++-level=c++98 option
#-------------------------------------------------------------------------------
if [ "$CFG_STDCXX" = "c++98" ]; then
cat <<EOF
NOTICE: The -no-c++11 / --c++-level=c++98 option is deprecated.
Qt 5.7 will require C++11 support. The options are in effect for this
Qt 5.6 build, but you should update your build scripts to remove the
option and, if necessary, upgrade your compiler.
EOF
fi
#-------------------------------------------------------------------------------
# finally save the executed command to another script
#-------------------------------------------------------------------------------

8
tools/configure/configureapp.cpp
View File

@ -4009,6 +4009,14 @@ void Configure::displayConfig()
<< "will be the same unless you are cross-compiling)." << endl
<< endl;
}
if (dictionary["C++STD"] == "c++98") {
sout << endl
<< "NOTE: The -no-c++11 / -c++-level c++98 option is deprecated." << endl
<< endl
<< "Qt 5.7 will require C++11 support. The options are in effect for this" << endl
<< "Qt 5.6 build, but you should update your build scripts to remove the" << endl
<< "option and, if necessary, upgrade your compiler." << endl;
}
if (!dictionary["PREFIX_COMPLAINTS"].isEmpty()) {
sout << endl
<< dictionary["PREFIX_COMPLAINTS"] << endl