diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-08-07 00:05:01 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-08-07 00:05:01 (GMT) |
| commit | aef0f96295cefdaa6e8e799733892aa00987226c (patch) | |
| tree | baf6ea0443100739798cbd83089dbdfb5824f972 | |
| parent | 2f298c32e13419d8942fa3ed6b561fa8c0cde24b (diff) | |
| parent | fe1165f3647c437528d9df437b939278f23260fc (diff) | |
| download | Qt-aef0f96295cefdaa6e8e799733892aa00987226c.zip Qt-aef0f96295cefdaa6e8e799733892aa00987226c.tar.gz Qt-aef0f96295cefdaa6e8e799733892aa00987226c.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfxscalegrid.cpp
| -rw-r--r-- | src/declarative/fx/qfxlayoutitem.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/fx/qfxscalegrid.cpp | 11 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/declarative/fx/qfxlayoutitem.cpp b/src/declarative/fx/qfxlayoutitem.cpp index 446a8d7..1f814e8 100644 --- a/src/declarative/fx/qfxlayoutitem.cpp +++ b/src/declarative/fx/qfxlayoutitem.cpp @@ -78,7 +78,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,LayoutItem,QFxLayoutItem) */ QFxLayoutItem::QFxLayoutItem(QFxItem* parent) - : QFxItem(parent), m_maximumSize(INT_MAX,INT_MAX), m_preferredSize(100,100), m_minimumSize(0,0) + : QFxItem(parent), m_maximumSize(INT_MAX,INT_MAX), m_minimumSize(0,0), m_preferredSize(100,100) { setGraphicsItem(this); } @@ -93,6 +93,7 @@ void QFxLayoutItem::setGeometry(const QRectF & rect) QSizeF QFxLayoutItem::sizeHint(Qt::SizeHint w, const QSizeF &constraint) const { + Q_UNUSED(constraint); if(w == Qt::MinimumSize){ return m_minimumSize; }else if(w == Qt::MaximumSize){ diff --git a/src/declarative/fx/qfxscalegrid.cpp b/src/declarative/fx/qfxscalegrid.cpp index 6ea909d..8eb9890 100644 --- a/src/declarative/fx/qfxscalegrid.cpp +++ b/src/declarative/fx/qfxscalegrid.cpp @@ -207,14 +207,13 @@ QFxScaleGrid::TileRule QFxGridScaledImage::stringToRule(const QString &s) { if (s == QLatin1String("Stretch")) return QFxScaleGrid::Stretch; - else if (s == QLatin1String("Repeat")) + if (s == QLatin1String("Repeat")) return QFxScaleGrid::Repeat; - else if (s == QLatin1String("Round")) + if (s == QLatin1String("Round")) return QFxScaleGrid::Round; - else { - qWarning() << "TileRule not supported:" << s; - return QFxScaleGrid::Stretch; - } + + qWarning() << "Unknown tile rule specified. Using Stretch"; + return QFxScaleGrid::Stretch; } bool QFxGridScaledImage::isValid() const |