fix svc templates, update ci to 5.12.2

Skycoder42 · Mar 16, 2019 · a7a400b · a7a400b
1 parent f1ad6f9
commit a7a400b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.qmake.conf b/.qmake.conf
@@ -6,6 +6,6 @@ DEFINES += QT_DEPRECATED_WARNINGS QT_ASCII_CAST_WARNINGS
 
 MODULE_VERSION_MAJOR = 2
 MODULE_VERSION_MINOR = 0
-MODULE_VERSION_PATCH = 0
+MODULE_VERSION_PATCH = 1
 MODULE_VERSION_IMPORT = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}
 MODULE_VERSION = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}.$${MODULE_VERSION_PATCH}
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ osx_image: xcode10.1
 env:
   global:
     - QDEP_CACHE_DIR=$HOME/.qdep-cache
-    - QT_VER=5.12.1
+    - QT_VER=5.12.2
     - DOCKER_IMAGE=base
     - MAKE_RUN_TESTS=true
     - TARGET_NAME=qtservice

diff --git a/ProjectTemplate/service.cpp b/ProjectTemplate/service.cpp
@@ -13,11 +13,11 @@ QtService::Service::CommandResult %{SvcCn}::onStart()
 @if '%{SocketPort}'
 	auto socket = getSocket();
 @endif
-	return OperationCompleted;
+	return CommandResult::Completed;
 }
 
 QtService::Service::CommandResult %{SvcCn}::onStop(int &exitCode)
 {
 	exitCode = EXIT_SUCCESS;
-	return OperationCompleted;
+	return CommandResult::Completed;
 }
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,13 +4,14 @@ image:
 version: build-{build}
 
 environment:
-  QT_VER: 5.12.1
+  QT_VER: 5.12.2
   MAKE_RUN_TESTS: true
   TARGET_NAME: qtservice
 
   matrix:
     - PLATFORM: msvc2017_64
     - PLATFORM: mingw73_64
+    - PLATFORM: mingw73_32
     - PLATFORM: winrt_x64_msvc2017
     - PLATFORM: msvc2017
     - PLATFORM: winrt_x86_msvc2017
@@ -22,6 +23,7 @@ install:
 
 build_script:
   - if "%PLATFORM%" == "mingw73_64" set NO_TESTS=true
+  - if "%PLATFORM%" == "mingw73_32" set NO_TESTS=true
   - .\qtmodules-travis\ci\win\build.bat
 
 after_build: