mandlm
/
ESGRAF48
1
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: mandlm:feature/qt-as-conan-package
Branches Tags
mandlm:develop
mandlm:feature/test-load
mandlm:feature/integrate-clang-tidy
mandlm:main
mandlm:feature/qt-as-conan-package
mandlm:feature/print-as-qtextdocument
mandlm:feature/print-with-inja
mandlm:feature/build-protobuf
...
pull from: mandlm:main
Branches Tags
mandlm:develop
mandlm:feature/test-load
mandlm:feature/integrate-clang-tidy
mandlm:main
mandlm:feature/qt-as-conan-package
mandlm:feature/print-as-qtextdocument
mandlm:feature/print-with-inja
mandlm:feature/build-protobuf

4 Commits
feature/qt ... main

Author SHA1 Message Date
Michael Mandl c438d96668 Merge branch 'hotfix/translations' 2019-02-17 19:50:07 +01:00
Michael Mandl 505b2d9007 Re-added translations 2019-02-17 19:49:52 +01:00
mandlm ce25b53ba0 Merge branch 'release/qt-conan' 2019-02-17 17:33:56 +01:00
mandlm e888f5c59d Bumped version number to 0.6 2019-02-17 17:33:43 +01:00
2 changed files with 2 additions and 1 deletions
Show Stats Expand all files Collapse all files

1
conanfile.txt
View File

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

2
source/CMakeLists.txt
View File

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