Skip to content

Commit c6321f9

Browse files
committed
fix build with msvc+
1 parent f94eb85 commit c6321f9

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

agent.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ using qt_monkey_agent::Agent;
2424
using qt_monkey_agent::Private::PacketTypeForMonkey;
2525
using qt_monkey_agent::Private::CommunicationAgentPart;
2626
using qt_monkey_agent::Private::ScriptRunner;
27+
using qt_monkey_agent::Private::Script;
2728
using qt_monkey_common::Semaphore;
29+
using qt_monkey_agent::CustomEventAnalyzer;
30+
using qt_monkey_agent::UserEventsAnalyzer;
31+
using qt_monkey_agent::PopulateScriptContext;
2832

2933
Agent *Agent::gAgent_ = nullptr;
3034

@@ -173,7 +177,7 @@ void Agent::onUserEventInScriptForm(const QString &script)
173177
PacketTypeForMonkey::NewUserAppEvent, script);
174178
}
175179

176-
void Agent::onRunScriptCommand(const Private::Script &script)
180+
void Agent::onRunScriptCommand(const Script &script)
177181
{
178182
GET_THREAD(thread)
179183
assert(QThread::currentThread() == thread_);

compiler.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ endif()
1818

1919
if (MSVC AND (MSVC_VERSION LESS 1900))
2020
message(FATAL_ERROR "MSVC version ${MSVC_VERSION} have no full c++11 support")
21+
elseif (MSVC)
22+
add_definitions(-DNOMINMAX)
2123
elseif (NOT MSVC)
2224
check_cxx_compiler_flag("-std=c++11" CXX_SUPPORTS_CXX11)
2325
if (CXX_SUPPORTS_CXX11)

contrib/json11

Submodule json11 updated 1 file

0 commit comments

Comments
 (0)