Skip to content

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit a7a400b

Browse filesBrowse files
committed
fix svc templates, update ci to 5.12.2
1 parent f1ad6f9 commit a7a400b
Copy full SHA for a7a400b

File tree

4 files changed

+7
-5
lines changed
Filter options

4 files changed

+7
-5
lines changed

‎.qmake.conf

Copy file name to clipboardExpand all lines: .qmake.conf
+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ DEFINES += QT_DEPRECATED_WARNINGS QT_ASCII_CAST_WARNINGS
66

77
MODULE_VERSION_MAJOR = 2
88
MODULE_VERSION_MINOR = 0
9-
MODULE_VERSION_PATCH = 0
9+
MODULE_VERSION_PATCH = 1
1010
MODULE_VERSION_IMPORT = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}
1111
MODULE_VERSION = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}.$${MODULE_VERSION_PATCH}

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ osx_image: xcode10.1
1010
env:
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

‎ProjectTemplate/service.cpp

Copy file name to clipboardExpand all lines: ProjectTemplate/service.cpp
+2-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ QtService::Service::CommandResult %{SvcCn}::onStart()
1313
@if '%{SocketPort}'
1414
auto socket = getSocket();
1515
@endif
16-
return OperationCompleted;
16+
return CommandResult::Completed;
1717
}
1818

1919
QtService::Service::CommandResult %{SvcCn}::onStop(int &exitCode)
2020
{
2121
exitCode = EXIT_SUCCESS;
22-
return OperationCompleted;
22+
return CommandResult::Completed;
2323
}

‎appveyor.yml

Copy file name to clipboardExpand all lines: appveyor.yml
+3-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ image:
44
version: build-{build}
55

66
environment:
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

2324
build_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

2729
after_build:

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.