From c0c6e23b8ca28b2587804d67ab1b0937fb0fd7e6 Mon Sep 17 00:00:00 2001 From: arkpar Date: Wed, 4 Feb 2015 10:30:07 +0100 Subject: [PATCH 1/2] fixed msvc build --- mix/ClientModel.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mix/ClientModel.h b/mix/ClientModel.h index 63731badf..37fbfbbc5 100644 --- a/mix/ClientModel.h +++ b/mix/ClientModel.h @@ -26,7 +26,7 @@ #include #include #include -#include "MixClient.h" +#include "MachineStates.h" namespace dev { @@ -38,6 +38,7 @@ class Web3Server; class RpcConnector; class QEther; class QDebugData; +class MixClient; /// Backend transaction config class struct TransactionSettings From 0f0b91e610cbb6bc8544dcf4e5fb6d1b0c907caa Mon Sep 17 00:00:00 2001 From: arkpar Date: Wed, 4 Feb 2015 10:54:11 +0100 Subject: [PATCH 2/2] fixed msvc build --- mix/AppContext.cpp | 7 ++++--- mix/ClientModel.cpp | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mix/AppContext.cpp b/mix/AppContext.cpp index e27eac9fd..4f7c494e8 100644 --- a/mix/AppContext.cpp +++ b/mix/AppContext.cpp @@ -27,15 +27,16 @@ #include #include #include -#include +#include #include "CodeModel.h" #include "FileIo.h" #include "ClientModel.h" #include "CodeEditorExtensionManager.h" #include "Exceptions.h" -#include "AppContext.h" #include "QEther.h" +#include "QVariableDefinition.h" #include "HttpServer.h" +#include "AppContext.h" using namespace dev; using namespace dev::eth; @@ -82,7 +83,7 @@ void AppContext::load() qmlRegisterType("CodeEditorExtensionManager", 1, 0, "CodeEditorExtensionManager"); qmlRegisterType("HttpServer", 1, 0, "HttpServer"); m_applicationEngine->load(QUrl("qrc:/qml/main.qml")); - QQuickWindow *window = qobject_cast(m_applicationEngine->rootObjects().at(0)); + QWindow *window = qobject_cast(m_applicationEngine->rootObjects().at(0)); window->setIcon(QIcon(":/res/mix_256x256x32.png")); appLoaded(); } diff --git a/mix/ClientModel.cpp b/mix/ClientModel.cpp index 365dce9a9..4ce7b7755 100644 --- a/mix/ClientModel.cpp +++ b/mix/ClientModel.cpp @@ -30,6 +30,7 @@ #include "Exceptions.h" #include "QContractDefinition.h" #include "QVariableDeclaration.h" +#include "QVariableDefinition.h" #include "ContractCallDataEncoder.h" #include "CodeModel.h" #include "ClientModel.h"