diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-08-13 05:58:42 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-08-13 05:58:42 (GMT) |
| commit | 72f565838c5d9f8ee8984d2a7b3586b1d51e656d (patch) | |
| tree | addd1187b29c839502c9618cfd15b4f8730c6e2a /src/declarative | |
| parent | 72a2933e08d54a139e2604babcc951c52ddbcd61 (diff) | |
| download | Qt-72f565838c5d9f8ee8984d2a7b3586b1d51e656d.zip Qt-72f565838c5d9f8ee8984d2a7b3586b1d51e656d.tar.gz Qt-72f565838c5d9f8ee8984d2a7b3586b1d51e656d.tar.bz2 | |
Make the QFxBorderImage the parent of its QFxScaleGrid
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/fx/qfxborderimage_p.h | 3 | ||||
| -rw-r--r-- | src/declarative/fx/qfxscalegrid.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/fx/qfxscalegrid_p.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxborderimage_p.h b/src/declarative/fx/qfxborderimage_p.h index 104f0f3..809b00d 100644 --- a/src/declarative/fx/qfxborderimage_p.h +++ b/src/declarative/fx/qfxborderimage_p.h @@ -77,8 +77,9 @@ public: QFxScaleGrid *getScaleGrid() { + Q_Q(QFxBorderImage); if (!border) - border = new QFxScaleGrid; + border = new QFxScaleGrid(q); return border; } diff --git a/src/declarative/fx/qfxscalegrid.cpp b/src/declarative/fx/qfxscalegrid.cpp index 60ab418..53c63a5 100644 --- a/src/declarative/fx/qfxscalegrid.cpp +++ b/src/declarative/fx/qfxscalegrid.cpp @@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE */ QML_DEFINE_NOCREATE_TYPE(QFxScaleGrid) -QFxScaleGrid::QFxScaleGrid() : QObject(), _left(0), _top(0), _right(0), _bottom(0) +QFxScaleGrid::QFxScaleGrid(QObject *parent) : QObject(parent), _left(0), _top(0), _right(0), _bottom(0) { } diff --git a/src/declarative/fx/qfxscalegrid_p.h b/src/declarative/fx/qfxscalegrid_p.h index 4beec85..7df90f1 100644 --- a/src/declarative/fx/qfxscalegrid_p.h +++ b/src/declarative/fx/qfxscalegrid_p.h @@ -67,7 +67,7 @@ class Q_DECLARATIVE_EXPORT QFxScaleGrid : public QObject Q_PROPERTY(int bottom READ bottom WRITE setBottom NOTIFY borderChanged) public: - QFxScaleGrid(); + QFxScaleGrid(QObject *parent=0); ~QFxScaleGrid(); bool isNull() const; |