File tree 4 files changed +7
-5
lines changed
Filter options
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
6
6
7
7
MODULE_VERSION_MAJOR = 2
8
8
MODULE_VERSION_MINOR = 0
9
- MODULE_VERSION_PATCH = 0
9
+ MODULE_VERSION_PATCH = 1
10
10
MODULE_VERSION_IMPORT = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}
11
11
MODULE_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
10
10
env :
11
11
global :
12
12
- QDEP_CACHE_DIR=$HOME/.qdep-cache
13
- - QT_VER=5.12.1
13
+ - QT_VER=5.12.2
14
14
- DOCKER_IMAGE=base
15
15
- MAKE_RUN_TESTS=true
16
16
- TARGET_NAME=qtservice
Original file line number Diff line number Diff line change @@ -13,11 +13,11 @@ QtService::Service::CommandResult %{SvcCn}::onStart()
13
13
@if ' %{SocketPort}'
14
14
auto socket = getSocket ();
15
15
@endif
16
- return OperationCompleted ;
16
+ return CommandResult::Completed ;
17
17
}
18
18
19
19
QtService::Service::CommandResult %{SvcCn}::onStop(int &exitCode)
20
20
{
21
21
exitCode = EXIT_SUCCESS;
22
- return OperationCompleted ;
22
+ return CommandResult::Completed ;
23
23
}
Original file line number Diff line number Diff line change 4
4
version : build-{build}
5
5
6
6
environment :
7
- QT_VER : 5.12.1
7
+ QT_VER : 5.12.2
8
8
MAKE_RUN_TESTS : true
9
9
TARGET_NAME : qtservice
10
10
11
11
matrix :
12
12
- PLATFORM : msvc2017_64
13
13
- PLATFORM : mingw73_64
14
+ - PLATFORM : mingw73_32
14
15
- PLATFORM : winrt_x64_msvc2017
15
16
- PLATFORM : msvc2017
16
17
- PLATFORM : winrt_x86_msvc2017
@@ -22,6 +23,7 @@ install:
22
23
23
24
build_script :
24
25
- if "%PLATFORM%" == "mingw73_64" set NO_TESTS=true
26
+ - if "%PLATFORM%" == "mingw73_32" set NO_TESTS=true
25
27
- .\qtmodules-travis\ci\win\build.bat
26
28
27
29
after_build :
You can’t perform that action at this time.
0 commit comments