Commit fcadae62 authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas

Merge branch 'release/2.10.0' into develop

parents fd44874a d65f281f
# ChangeLog # ChangeLog
## version 2.10.0 - 2019-05-17
- cmake refactoring
- fix interaction
- better handling of font setting
## version 2.9.2 - 2019-05-03 ## version 2.9.2 - 2019-05-03
- do not move window when we are over a menu button - do not move window when we are over a menu button
## version 2.9.1 - 2019-05-02 ## version 2.9.1 - 2019-05-02
......
...@@ -23,8 +23,8 @@ project(dtkWidgets) ...@@ -23,8 +23,8 @@ project(dtkWidgets)
## ################################################################### ## ###################################################################
set(${PROJECT_NAME}_VERSION_MAJOR 2) set(${PROJECT_NAME}_VERSION_MAJOR 2)
set(${PROJECT_NAME}_VERSION_MINOR 9) set(${PROJECT_NAME}_VERSION_MINOR 10)
set(${PROJECT_NAME}_VERSION_PATCH 2) set(${PROJECT_NAME}_VERSION_PATCH 0)
set(${PROJECT_NAME}_VERSION set(${PROJECT_NAME}_VERSION
${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}) ${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH})
......
...@@ -17,8 +17,8 @@ channels: ...@@ -17,8 +17,8 @@ channels:
- dtk - dtk
dependencies: dependencies:
- qt >=5.9.0 - qt >=5.9.0
- dtk-core >=2.3.0 - dtk-core >=2.4.0
- dtk-fonts - dtk-fonts >=2.1.0
- dtk-log - dtk-log
- dtk-themes - dtk-themes
......
...@@ -38,15 +38,15 @@ requirements: ...@@ -38,15 +38,15 @@ requirements:
- {{ cdt('libxxf86vm') }} # [linux] - {{ cdt('libxxf86vm') }} # [linux]
host: host:
- qt >=5.9.0 - qt >=5.9.0
- dtk-core >=2.3.0 - dtk-core >=2.4.0
- dtk-fonts - dtk-fonts >=2.1.0
- dtk-log - dtk-log
- dtk-themes - dtk-themes
run: run:
- qt >=5.9.0 - qt >=5.9.0
- dtk-core >=2.3.0 - dtk-core >=2.4.0
- dtk-fonts - dtk-fonts >=2.1.0
- dtk-log - dtk-log
- dtk-themes - 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