Merge remote-tracking branch 'origin/3.3'

Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
index 4852e24217..c9e417c59b 100644
--- a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
+++ b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
@@ -390,6 +390,7 @@ private slots:
     void empty_trailing_lines_data();
     void undef();
     void concat();
+    void excessive_nesting();
 };
 
 // Remove all #... lines, and 'simplify' string, to allow easily comparing the result
@@ -1901,6 +1902,23 @@ void tst_Preprocessor::concat()
     QCOMPARE(prep.constData(), output.constData());
 }
 
+void tst_Preprocessor::excessive_nesting()
+{
+    Environment env;
+    Preprocessor preprocess(0, &env);
+    QByteArray input;
+    const QByteArray output =
+        "# 1 \"<stdin>\"\n"
+        "# 2001 \"<stdin>\"\n";
+    for (int i = 0; i < 1000; ++i)
+        input += "#if FOO\n";
+    for (int i = 0; i < 1000; ++i)
+        input += "#endif\n";
+    QByteArray prep = preprocess.run(QLatin1String("<stdin>"), input);
+    // Output cannot be precisely determined, but it shouldn't crash.
+    QCOMPARE(prep, output);
+}
+
 void tst_Preprocessor::compare_input_output(bool keepComments)
 {
     QFETCH(QByteArray, input);