File tree Expand file tree Collapse file tree 4 files changed +7
-5
lines changed Expand file tree Collapse file tree 4 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -6,6 +6,6 @@ DEFINES += QT_DEPRECATED_WARNINGS QT_ASCII_CAST_WARNINGS
66
77MODULE_VERSION_MAJOR = 2
88MODULE_VERSION_MINOR = 0
9- MODULE_VERSION_PATCH = 0
9+ MODULE_VERSION_PATCH = 1
1010MODULE_VERSION_IMPORT = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}
1111MODULE_VERSION = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}.$${MODULE_VERSION_PATCH}
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ osx_image: xcode10.1
1010env :
1111 global :
1212 - QDEP_CACHE_DIR=$HOME/.qdep-cache
13- - QT_VER=5.12.1
13+ - QT_VER=5.12.2
1414 - DOCKER_IMAGE=base
1515 - MAKE_RUN_TESTS=true
1616 - TARGET_NAME=qtservice
Original file line number Diff line number Diff line change @@ -13,11 +13,11 @@ QtService::Service::CommandResult %{SvcCn}::onStart()
1313@if ' %{SocketPort}'
1414auto socket = getSocket ();
1515@endif
16- return OperationCompleted ;
16+ return CommandResult::Completed ;
1717}
1818
1919QtService::Service::CommandResult %{SvcCn}::onStop(int &exitCode)
2020{
2121exitCode = EXIT_SUCCESS;
22- return OperationCompleted ;
22+ return CommandResult::Completed ;
2323}
Original file line number Diff line number Diff line change 44version : build-{build}
55
66environment :
7- QT_VER : 5.12.1
7+ QT_VER : 5.12.2
88 MAKE_RUN_TESTS : true
99 TARGET_NAME : qtservice
1010
1111 matrix :
1212 - PLATFORM : msvc2017_64
1313 - PLATFORM : mingw73_64
14+ - PLATFORM : mingw73_32
1415 - PLATFORM : winrt_x64_msvc2017
1516 - PLATFORM : msvc2017
1617 - PLATFORM : winrt_x86_msvc2017
@@ -22,6 +23,7 @@ install:
2223
2324build_script :
2425 - if "%PLATFORM%" == "mingw73_64" set NO_TESTS=true
26+ - if "%PLATFORM%" == "mingw73_32" set NO_TESTS=true
2527 - .\qtmodules-travis\ci\win\build.bat
2628
2729after_build :
You can’t perform that action at this time.
0 commit comments