summaryrefslogtreecommitdiffstats
path: root/examples/declarative/extending
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-03-08 02:30:34 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-03-08 02:30:34 (GMT)
commita7856e3a5f6b9e5e2fd10690574b5f44ca50ba73 (patch)
tree4b22fecd7d8e2ab6b359400d57f6aa177e3de939 /examples/declarative/extending
parent56768688cc49c2dd2234598b41ebbfd046937ac5 (diff)
downloadQt-a7856e3a5f6b9e5e2fd10690574b5f44ca50ba73.zip
Qt-a7856e3a5f6b9e5e2fd10690574b5f44ca50ba73.tar.gz
Qt-a7856e3a5f6b9e5e2fd10690574b5f44ca50ba73.tar.bz2
Make compile following QDeclarativeMetaProperty renaming
Diffstat (limited to 'examples/declarative/extending')
-rw-r--r--examples/declarative/extending/binding/happybirthday.cpp2
-rw-r--r--examples/declarative/extending/binding/happybirthday.h6
-rw-r--r--examples/declarative/extending/valuesource/happybirthday.cpp2
-rw-r--r--examples/declarative/extending/valuesource/happybirthday.h6
4 files changed, 8 insertions, 8 deletions
diff --git a/examples/declarative/extending/binding/happybirthday.cpp b/examples/declarative/extending/binding/happybirthday.cpp
index 7d4d021..aa5f937 100644
--- a/examples/declarative/extending/binding/happybirthday.cpp
+++ b/examples/declarative/extending/binding/happybirthday.cpp
@@ -50,7 +50,7 @@ HappyBirthday::HappyBirthday(QObject *parent)
timer->start(1000);
}
-void HappyBirthday::setTarget(const QDeclarativeMetaProperty &p)
+void HappyBirthday::setTarget(const QDeclarativeProperty &p)
{
m_target = p;
}
diff --git a/examples/declarative/extending/binding/happybirthday.h b/examples/declarative/extending/binding/happybirthday.h
index ee4d1ec..eb2da5e 100644
--- a/examples/declarative/extending/binding/happybirthday.h
+++ b/examples/declarative/extending/binding/happybirthday.h
@@ -42,7 +42,7 @@
#define HAPPYBIRTHDAY_H
#include <QDeclarativePropertyValueSource>
-#include <QDeclarativeMetaProperty>
+#include <QDeclarativeProperty>
#include <qdeclarative.h>
#include <QStringList>
@@ -54,7 +54,7 @@ Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
public:
HappyBirthday(QObject *parent = 0);
- virtual void setTarget(const QDeclarativeMetaProperty &);
+ virtual void setTarget(const QDeclarativeProperty &);
QString name() const;
void setName(const QString &);
@@ -67,7 +67,7 @@ signals:
private:
int m_line;
QStringList m_lyrics;
- QDeclarativeMetaProperty m_target;
+ QDeclarativeProperty m_target;
QString m_name;
};
QML_DECLARE_TYPE(HappyBirthday);
diff --git a/examples/declarative/extending/valuesource/happybirthday.cpp b/examples/declarative/extending/valuesource/happybirthday.cpp
index 7b9d05a..0dbbd6e 100644
--- a/examples/declarative/extending/valuesource/happybirthday.cpp
+++ b/examples/declarative/extending/valuesource/happybirthday.cpp
@@ -50,7 +50,7 @@ HappyBirthday::HappyBirthday(QObject *parent)
timer->start(1000);
}
-void HappyBirthday::setTarget(const QDeclarativeMetaProperty &p)
+void HappyBirthday::setTarget(const QDeclarativeProperty &p)
{
m_target = p;
}
diff --git a/examples/declarative/extending/valuesource/happybirthday.h b/examples/declarative/extending/valuesource/happybirthday.h
index 3e68c35..b48c012 100644
--- a/examples/declarative/extending/valuesource/happybirthday.h
+++ b/examples/declarative/extending/valuesource/happybirthday.h
@@ -42,7 +42,7 @@
#define HAPPYBIRTHDAY_H
#include <QDeclarativePropertyValueSource>
-#include <QDeclarativeMetaProperty>
+#include <QDeclarativeProperty>
#include <qdeclarative.h>
#include <QStringList>
@@ -57,7 +57,7 @@ Q_PROPERTY(QString name READ name WRITE setName)
public:
HappyBirthday(QObject *parent = 0);
- virtual void setTarget(const QDeclarativeMetaProperty &);
+ virtual void setTarget(const QDeclarativeProperty &);
// ![1]
QString name() const;
@@ -69,7 +69,7 @@ private slots:
private:
int m_line;
QStringList m_lyrics;
- QDeclarativeMetaProperty m_target;
+ QDeclarativeProperty m_target;
QString m_name;
// ![2]
};