Compare commits

..

No commits in common. "main" and "feature/qt-as-conan-package" have entirely different histories.

2 changed files with 1 additions and 2 deletions

View File

@ -10,4 +10,3 @@ cmake
[options]
protobuf:shared=False
qt:qttools=True
qt:qttranslations=True

View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.6)
set(BUILD_VERSION_MAJOR_MINOR 0.6)
set(BUILD_VERSION_MAJOR_MINOR 0.5)
if ($ENV{BUILD_NUMBER})
set(BUILD_VERSION_PATCH $ENV{BUILD_NUMBER})