Commit 95ffa696 authored by CABEL Tristan's avatar CABEL Tristan

Merge branch 'release/2.11.0' into develop

parents cb91fc7a cf519c60
# ChangeLog
## version 2.11.0 - 2019-05-21
- menubar generator use dtk-core parameter reader
- add python converter for parameters new json file formats
- fix menubar size
## version 2.10.0 - 2019-05-17
- cmake refactoring
- fix interaction
......
......@@ -23,7 +23,7 @@ project(dtkWidgets)
## ###################################################################
set(${PROJECT_NAME}_VERSION_MAJOR 2)
set(${PROJECT_NAME}_VERSION_MINOR 10)
set(${PROJECT_NAME}_VERSION_MINOR 11)
set(${PROJECT_NAME}_VERSION_PATCH 0)
set(${PROJECT_NAME}_VERSION
${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH})
......
......@@ -17,7 +17,7 @@ channels:
- dtk
dependencies:
- qt >=5.9.0
- dtk-core >=2.4.0
- dtk-core >=2.5.0
- dtk-fonts >=2.1.0
- dtk-log
- dtk-themes
......
......@@ -38,14 +38,14 @@ requirements:
- {{ cdt('libxxf86vm') }} # [linux]
host:
- qt >=5.9.0
- dtk-core >=2.4.0
- dtk-core >=2.5.0
- dtk-fonts >=2.1.0
- dtk-log
- dtk-themes
run:
- qt >=5.9.0
- dtk-core >=2.4.0
- dtk-core >=2.5.0
- dtk-fonts >=2.1.0
- dtk-log
- dtk-themes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment