Commit 470a669e authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas

Merge branch 'release/2.7.0' into develop

parents db47eca8 cf56f0b9
# ChangeLog
## version 2.7.0 - 20019-03-21
- add dtkWidgetsMenu (remove dtkWidgetsOverlayPaneManager and toggle button in Pane)
- add dtk-core as dependancie for new features:
- add Workspace abstraction with factory and manager; add also dtkWidgetsWorkspaceBar and StackBar
- add widgets parameters
## version 2.6.4 - 20019-03-12
- overlayPane dynamically adjust its width
## version 2.6.3 - 20019-02-22
- fix resizing of dtkWidgetsOverlayPane
- do not use hard coded color in dtkWidgetsHUDItem QPainter
......
......@@ -23,8 +23,8 @@ project(dtkWidgets)
## ###################################################################
set(${PROJECT_NAME}_VERSION_MAJOR 2)
set(${PROJECT_NAME}_VERSION_MINOR 6)
set(${PROJECT_NAME}_VERSION_PATCH 3)
set(${PROJECT_NAME}_VERSION_MINOR 7)
set(${PROJECT_NAME}_VERSION_PATCH 0)
set(${PROJECT_NAME}_VERSION
${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH})
......@@ -77,6 +77,10 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
if(MSVC)
add_definitions("/wd4068")
endif(MSVC)
## ###################################################################
## Test setup
## ###################################################################
......
......@@ -44,7 +44,7 @@ Q_DECLARE_METATYPE(dtkWidgetsParameter *);
// ///////////////////////////////////////////////////////////////////
template <typename T>
class DTKWIDGETS_EXPORT dtkWidgetsParameterBase : public dtkWidgetsParameter
class dtkWidgetsParameterBase : public dtkWidgetsParameter
{
public:
dtkWidgetsParameterBase(QWidget *);
......
#include "dtkWidgetsWorkspaceBar.h"
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