Merge remote-tracking branch 'origin/4.0'

 Conflicts:
	src/plugins/projectexplorer/session.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I6946139f5e5fa3a9cdbb322fd50be248e2c0133f

1 files changed, 29 insertions, 0 deletions

diff --git a/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp b/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
index d2de76e4d8..cf26114d9a 100644
--- a/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
+++ b/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
@@ -219,6 +219,8 @@ private slots:
     void test_checksymbols_infiniteLoop_data();
     void test_checksymbols_infiniteLoop();
 
+    void test_checkForValidSymbolFileId();
+
     void test_parentOfBlock();
 
     void findField();
@@ -1165,6 +1167,33 @@ void tst_CheckSymbols::test_checksymbols_infiniteLoop()
     TestCase::runCheckSymbols(document1, snapshot);
 }
 
+void tst_CheckSymbols::test_checkForValidSymbolFileId()
+{
+    const QByteArray contents =
+        "constexpr int parent_of(const int f) { return 1; }\n"
+        "\n"
+        "template <typename T> struct wrapper { const T* ptr; };\n"
+        "template <int> struct Dummy;\n"
+        "\n"
+        "namespace impl {\n"
+        "    template <int f>\n"
+        "    struct dummy_impl {\n"
+        "        wrapper<Dummy<parent_of(f)>> parent;\n"
+        "    };\n"
+        "}\n"
+        "\n"
+        "template <int f>\n"
+        "struct Dummy : impl::dummy_impl<f> {};\n"
+        "\n"
+        "void client()\n"
+        "{\n"
+        "    wrapper<Dummy<1>> a;\n"
+        "    a.ptr->parent.ptr;\n"
+        "}\n";
+
+    BaseTestCase tc(contents);
+}
+
 void tst_CheckSymbols::test_parentOfBlock()
 {
     const QByteArray source = "void C::f()\n"