feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake build: Build fix for automoc compilation failure

Browse Source 
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 03b80025a9

Change-Id: I6e12526abc7e8f8a9562e7f2502e070e379117f4
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Cristian Adam
2019-09-02 17:51:07 +02:00
parent 4b8ec5ffb7
commit 05ce7a6774
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/autotest/boost/boosttestoutputreader.h
View File

@@ -28,6 +28,9 @@
#include "../testoutputreader.h" #include "../testoutputreader.h"
namespace Autotest { namespace Autotest {
class TestTreeItem;
namespace Internal { namespace Internal {
class BoostTestResult; class BoostTestResult;

4
src/plugins/autotest/testframeworkmanager.h
View File

@@ -37,6 +37,9 @@ QT_END_NAMESPACE
namespace Core { class Id; } namespace Core { class Id; }
namespace Autotest { namespace Autotest {
class TestTreeItem;
namespace Internal { namespace Internal {
class TestRunner; class TestRunner;
@@ -47,7 +50,6 @@ struct TestSettings;
class IFrameworkSettings; class IFrameworkSettings;
class ITestParser; class ITestParser;
class ITestSettingsPage; class ITestSettingsPage;
class TestTreeItem;
class TestTreeModel; class TestTreeModel;
class TestFrameworkManager class TestFrameworkManager