168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uncrustified

This commit is contained in:
Uwe Rathmann 2019-01-07 09:13:53 +01:00
parent 4e54d1cb58
commit e1ca897478
18 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/automotive/SpeedometerSkinlet.cpp
View File

@ -133,6 +133,7 @@ QSGNode* SpeedometerSkinlet::updateLabelsNode( const Speedometer* speedometer, Q
QPointF center = QPointF( panelRect.x() + panelRect.width() / 2, QPointF center = QPointF( panelRect.x() + panelRect.width() / 2,
panelRect.y() + panelRect.height() / 2 ); panelRect.y() + panelRect.height() / 2 );
auto radius = static_cast< float >( panelRect.width() / 2 ); auto radius = static_cast< float >( panelRect.width() / 2 );
const QMarginsF numbersMargins = speedometer->marginsHint( Speedometer::Labels ); const QMarginsF numbersMargins = speedometer->marginsHint( Speedometer::Labels );

2
src/controls/QskTextInput.cpp
View File

@ -775,10 +775,10 @@ QVariant QskTextInput::inputMethodQuery(
{ {
return locale(); return locale();
} }
case Qt::ImCursorRectangle:
#if QT_VERSION >= QT_VERSION_CHECK( 5, 7, 0 ) #if QT_VERSION >= QT_VERSION_CHECK( 5, 7, 0 )
case Qt::ImInputItemClipRectangle: case Qt::ImInputItemClipRectangle:
#endif #endif
case Qt::ImCursorRectangle:
{ {
QVariant v = m_data->textInput->inputMethodQuery( query, argument ); QVariant v = m_data->textInput->inputMethodQuery( query, argument );
#if 1 #if 1