Commit f19f7b43 authored by finetjul's avatar finetjul

BUG: Fix ctkCheckBox and nested style isssue in general.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21560 3bd1e089-480b-0410-8dfb-8563597acbee
parent 12bb71f0
......@@ -33,7 +33,7 @@
qSlicerStyle::qSlicerStyle()
: Superclass(new QCleanlooksStyle)
{
this->baseStyle()->setParent(this);
}
// --------------------------------------------------------------------------
......
......@@ -22,16 +22,19 @@
#define __qSlicerStyle_h
// Qt includes
#include <QProxyStyle>
//#include <QProxyStyle>
#include "qSlicerBaseQTGUIExport.h"
// CTK includes
#include <ctkProxyStyle.h>
// Slicer includes
#include "qSlicerBaseQTGUIExport.h"
class Q_SLICER_BASE_QTGUI_EXPORT qSlicerStyle : public QProxyStyle
class Q_SLICER_BASE_QTGUI_EXPORT qSlicerStyle : public ctkProxyStyle
{
public:
/// Superclass typedef
typedef QProxyStyle Superclass;
typedef ctkProxyStyle Superclass;
/// Constructors
qSlicerStyle();
......
......@@ -66,7 +66,7 @@ if(NOT DEFINED CTK_DIR)
ExternalProject_Add(${proj}
GIT_REPOSITORY "${git_protocol}://github.com/commontk/CTK.git"
GIT_TAG "154933009ab9ed82c0ea818c962c5283e330632a"
GIT_TAG "0bed66d93f69a860dec9df72861fdb5af8a0be34"
"${slicer_external_update}"
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
BINARY_DIR ${proj}-build
......
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