Merge remote-tracking branch 'origin/4.14' into master

Change-Id: Ib4363db8e71488e1d13e8c1012023abfaf06286b
2020-10-22 14:38:01 +02:00
parent baf25e4cdb c510cf79d8
commit 9c6108afd1
22 changed files with 163 additions and 84 deletions
--- a/src/plugins/cppeditor/cppquickfix_test.cpp
+++ b/src/plugins/cppeditor/cppquickfix_test.cpp
@@ -4283,6 +4283,23 @@ void CppEditorPlugin::test_quickfix_InsertDefsFromDecls_data()

        } // namespace N)";
    QTest::addRow("no candidates")
+            << QByteArrayList{origHeader, origHeader}
+            << QByteArrayList{origSource, origSource}
+            << int(InsertDefsFromDecls::Mode::Alternating);
+
+    origHeader = R"(
+        namespace N {
+        class @C
+        {
+        public:
+            friend void ignoredFriend();
+            void ignoredImplemented() {};
+
+        signals:
+            void ignoredSignal();
+        };
+        } // namespace N)";
+    QTest::addRow("no member functions")
            << QByteArrayList{origHeader, ""}
            << QByteArrayList{origSource, ""}
            << int(InsertDefsFromDecls::Mode::Alternating);