From 27361eadf178e6544277118973a00151daebfc8a Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 9 Jul 2015 16:58:05 -0700
Subject: Add a deprecation warning to configure about -no-c++11

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>
---
 configure                        | 14 ++++++++++++++
 tools/configure/configureapp.cpp |  8 ++++++++
 2 files changed, 22 insertions(+)

diff --git a/configure b/configure
index 95b44e7900..85de53ca63 100755
--- a/configure
+++ b/configure
@@ -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
 #-------------------------------------------------------------------------------
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 62af1970fe..1fdc4bb657 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -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
-- 
cgit v1.2.3