Merge remote-tracking branch 'origin/4.0'

Change-Id: I80bc3371c6d7cf9f2d46cbcf8e79e4761213d8aa

src/plugins/autotest/autotestunittests.h

@@ -51,6 +51,7 @@ private slots:
     void testCodeParserSwitchStartup();
     void testCodeParserSwitchStartup_data();
     void testCodeParserGTest();
+    void testCodeParserGTest_data();
 
 private:
     TestTreeModel *m_model;