Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

4 files changed, 18 insertions, 5 deletions

diff --git a/src/declarative/fx/qfxborderimage.cpp b/src/declarative/fx/qfxborderimage.cpp
index f8c79a6..67b05fd 100644
--- a/src/declarative/fx/qfxborderimage.cpp
+++ b/src/declarative/fx/qfxborderimage.cpp
@@ -284,7 +284,11 @@ QFxBorderImage::TileMode QFxBorderImage::horizontalTileMode() const
 void QFxBorderImage::setHorizontalTileMode(TileMode t)
 {
     Q_D(QFxBorderImage);
-    d->horizontalTileMode = t;
+    if (t != d->horizontalTileMode) {
+        d->horizontalTileMode = t;
+        emit tileModeChanged();
+        update();
+    }
 }
 
 QFxBorderImage::TileMode QFxBorderImage::verticalTileMode() const
@@ -296,7 +300,11 @@ QFxBorderImage::TileMode QFxBorderImage::verticalTileMode() const
 void QFxBorderImage::setVerticalTileMode(TileMode t)
 {
     Q_D(QFxBorderImage);
-    d->verticalTileMode = t;
+    if (t != d->verticalTileMode) {
+        d->verticalTileMode = t;
+        emit tileModeChanged();
+        update();
+    }
 }
 
 void QFxBorderImage::setGridScaledImage(const QFxGridScaledImage& sci)
diff --git a/src/declarative/fx/qfxborderimage.h b/src/declarative/fx/qfxborderimage.h
index b0ec3bc..c6885fb 100644
--- a/src/declarative/fx/qfxborderimage.h
+++ b/src/declarative/fx/qfxborderimage.h
@@ -59,8 +59,8 @@ class Q_DECLARATIVE_EXPORT QFxBorderImage : public QFxImageBase
     Q_ENUMS(TileMode)
 
     Q_PROPERTY(QFxScaleGrid *border READ border CONSTANT)
-    Q_PROPERTY(TileMode horizontalTileMode READ horizontalTileMode WRITE setHorizontalTileMode)
-    Q_PROPERTY(TileMode verticalTileMode READ verticalTileMode WRITE setVerticalTileMode)
+    Q_PROPERTY(TileMode horizontalTileMode READ horizontalTileMode WRITE setHorizontalTileMode NOTIFY tileModeChanged)
+    Q_PROPERTY(TileMode verticalTileMode READ verticalTileMode WRITE setVerticalTileMode NOTIFY tileModeChanged)
 
 public:
     QFxBorderImage(QFxItem *parent=0);
@@ -79,6 +79,9 @@ public:
     void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
     void setSource(const QUrl &url);
 
+signals:
+    void tileModeChanged();
+
 protected:
     QFxBorderImage(QFxBorderImagePrivate &dd, QFxItem *parent);
 
diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qfximage.h
index c8e21ea..4f46495 100644
--- a/src/declarative/fx/qfximage.h
+++ b/src/declarative/fx/qfximage.h
@@ -57,7 +57,7 @@ class Q_DECLARATIVE_EXPORT QFxImage : public QFxImageBase
     Q_ENUMS(FillMode)
 
     Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap DESIGNABLE false)
-    Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged);
+    Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged)
 
 public:
     QFxImage(QFxItem *parent=0);
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index f5f502c..572fcc7 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -658,6 +658,7 @@ signals:
     void downPressed(QFxKeyEvent *event);
 
     void asteriskPressed(QFxKeyEvent *event);
+    void numberSignPressed(QFxKeyEvent *event);
     void escapePressed(QFxKeyEvent *event);
     void returnPressed(QFxKeyEvent *event);
     void enterPressed(QFxKeyEvent *event);
@@ -713,6 +714,7 @@ const QFxKeysAttached::SigMap QFxKeysAttached::sigMap[] = {
     { Qt::Key_Up, "upPressed" },
     { Qt::Key_Down, "downPressed" },
     { Qt::Key_Asterisk, "asteriskPressed" },
+    { Qt::Key_NumberSign, "numberSignPressed" },
     { Qt::Key_Escape, "escapePressed" },
     { Qt::Key_Return, "returnPressed" },
     { Qt::Key_Enter, "enterPressed" },