summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-08-06 23:25:03 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-08-06 23:25:03 (GMT)
commitd469d5e12635a6bad54fe8bc9404c1fdf209635c (patch)
treee19579c10eb072ac708fc09eb6bedeb71f82860e /src
parentd0ee8e1a7d71d720a1fac789299cf59a58791149 (diff)
downloadQt-d469d5e12635a6bad54fe8bc9404c1fdf209635c.zip
Qt-d469d5e12635a6bad54fe8bc9404c1fdf209635c.tar.gz
Qt-d469d5e12635a6bad54fe8bc9404c1fdf209635c.tar.bz2
Fix warnings.
Diffstat (limited to 'src')
-rw-r--r--src/declarative/fx/qfxlayoutitem.cpp3
-rw-r--r--src/declarative/fx/qfxscalegrid.cpp4
2 files changed, 6 insertions, 1 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 198ac6d..da3b4a3 100644
--- a/src/declarative/fx/qfxscalegrid.cpp
+++ b/src/declarative/fx/qfxscalegrid.cpp
@@ -41,6 +41,7 @@
#include <QBuffer>
#include <qml.h>
+#include <QDebug>
#include "qfxscalegrid_p.h"
@@ -210,6 +211,9 @@ QFxScaleGrid::TileRule QFxGridScaledImage::stringToRule(const QString &s) const
return QFxScaleGrid::Repeat;
if (s == QLatin1String("Round"))
return QFxScaleGrid::Round;
+
+ qWarning() << "Unknown tile rule specified. Using Stretch";
+ return QFxScaleGrid::Stretch;
}
bool QFxGridScaledImage::isValid() const