mcontainerstyle.h   mcontainerstyle.h 
skipping to change at line 32 skipping to change at line 32
#include <mwidgetstyle.h> #include <mwidgetstyle.h>
#include <QSize> #include <QSize>
class M_VIEWS_EXPORT MContainerStyle : public MWidgetStyle class M_VIEWS_EXPORT MContainerStyle : public MWidgetStyle
{ {
Q_OBJECT Q_OBJECT
M_STYLE(MContainerStyle) M_STYLE(MContainerStyle)
M_STYLE_ATTRIBUTE(QSize, iconSize, IconSize) M_STYLE_ATTRIBUTE(QSize, iconSize, IconSize)
M_STYLE_ATTRIBUTE(int, internalMargins, InternalMargins) M_STYLE_ATTRIBUTE(int, internalMargins, InternalMargins)
M_STYLE_ATTRIBUTE(int, internalItemSpacing, InternalItemSpacing) M_STYLE_ATTRIBUTE(int, internalItemSpacing, InternalItemSpac
M_STYLE_ATTRIBUTE(QString, titleStyleName, TitleStyleName) ing)
M_STYLE_ATTRIBUTE(QString, headerStyleName, HeaderStyleName)
M_STYLE_ATTRIBUTE(QString, titleStyleName, TitleStyleName)
M_STYLE_ATTRIBUTE(QString, progressIndicatorStyleName, ProgressIndicato
rStyleName)
}; };
class M_VIEWS_EXPORT MContainerStyleContainer : public MWidgetStyleContaine r class M_VIEWS_EXPORT MContainerStyleContainer : public MWidgetStyleContaine r
{ {
M_STYLE_CONTAINER(MContainerStyle) M_STYLE_CONTAINER(MContainerStyle)
}; };
#endif #endif
 End of changes. 1 change blocks. 
4 lines changed or deleted 8 lines changed or added


 msliderstyle.h   msliderstyle.h 
skipping to change at line 189 skipping to change at line 189
/*! /*!
\property MSlider::minLabelFixedWidth \property MSlider::minLabelFixedWidth
\brief Fixed width of the minimum label of the slider, if not empty \brief Fixed width of the minimum label of the slider, if not empty
*/ */
M_STYLE_ATTRIBUTE(qreal, minLabelFixedWidth, MinLabelFixedWidth) M_STYLE_ATTRIBUTE(qreal, minLabelFixedWidth, MinLabelFixedWidth)
/*! /*!
\property MSlider::maxLabelFixedWidth \property MSlider::maxLabelFixedWidth
\brief Fixed width of the maximum label of the slider, if not empty \brief Fixed width of the maximum label of the slider, if not empty
*/ */
M_STYLE_ATTRIBUTE(qreal, maxLabelFixedWidth, MaxLabelFixedWidth) M_STYLE_ATTRIBUTE(qreal, maxLabelFixedWidth, MaxLabelFixedWidth)
/*!
\property MSlider::feedbackSpeedLimit
\brief When slider is moved over this speed there will be no feedba
ck (in mm/s)
*/
M_STYLE_ATTRIBUTE(int, feedbackSpeedLimit, FeedbackSpeedLimit)
}; };
class M_VIEWS_EXPORT MSliderStyleContainer : public MWidgetStyleContainer class M_VIEWS_EXPORT MSliderStyleContainer : public MWidgetStyleContainer
{ {
M_STYLE_CONTAINER(MSliderStyle) M_STYLE_CONTAINER(MSliderStyle)
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/