summaryrefslogtreecommitdiff
path: root/src/plugins/autotest
diff options
context:
space:
mode:
authorCristian Adam <cristian.adam@qt.io>2019-09-02 17:51:07 +0200
committerCristian Adam <cristian.adam@qt.io>2019-09-03 06:59:31 +0000
commit05ce7a67746b06788f507d956007e8f5054dfc9c (patch)
tree100e57019eac31d0f58aff6a214cb71876d794c4 /src/plugins/autotest
parent4b8ec5ffb79aa3010b1cd65f3a67a93381022021 (diff)
downloadqt-creator-05ce7a67746b06788f507d956007e8f5054dfc9c.tar.gz
CMake build: Build fix for automoc compilation failure
Compiler (MSVC, MinGW) got confused while trying to compile automoc's code generated files for autotest/quick/quicktestparser.h Autotest::TestTreeItem moved from Autotest::Internal::TestTreeItem, but a few forward declarations remained in Autotest::Internal, which resulted in errors like: error C2555: overriding virtual function return type differs and is not covariant Side effect of commit 03b80025a94542e9f6dc09ace431f82cfabfabd6 Change-Id: I6e12526abc7e8f8a9562e7f2502e070e379117f4 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/autotest')
-rw-r--r--src/plugins/autotest/boost/boosttestoutputreader.h3
-rw-r--r--src/plugins/autotest/testframeworkmanager.h4
2 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/autotest/boost/boosttestoutputreader.h b/src/plugins/autotest/boost/boosttestoutputreader.h
index 41d0dbdf78..cdbbeedad4 100644
--- a/src/plugins/autotest/boost/boosttestoutputreader.h
+++ b/src/plugins/autotest/boost/boosttestoutputreader.h
@@ -28,6 +28,9 @@
#include "../testoutputreader.h"
namespace Autotest {
+
+class TestTreeItem;
+
namespace Internal {
class BoostTestResult;
diff --git a/src/plugins/autotest/testframeworkmanager.h b/src/plugins/autotest/testframeworkmanager.h
index f96a4a0b1f..9d1c81079e 100644
--- a/src/plugins/autotest/testframeworkmanager.h
+++ b/src/plugins/autotest/testframeworkmanager.h
@@ -37,6 +37,9 @@ QT_END_NAMESPACE
namespace Core { class Id; }
namespace Autotest {
+
+class TestTreeItem;
+
namespace Internal {
class TestRunner;
@@ -47,7 +50,6 @@ struct TestSettings;
class IFrameworkSettings;
class ITestParser;
class ITestSettingsPage;
-class TestTreeItem;
class TestTreeModel;
class TestFrameworkManager