summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/declarative/graphicsitems/qdeclarativepath_p.h2
-rw-r--r--src/declarative/util/qdeclarativeanimation_p.h18
-rw-r--r--src/declarative/util/qdeclarativefontloader_p.h2
3 files changed, 11 insertions, 11 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativepath_p.h b/src/declarative/graphicsitems/qdeclarativepath_p.h
index 5ab5cfd..195057c 100644
--- a/src/declarative/graphicsitems/qdeclarativepath_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepath_p.h
@@ -190,7 +190,7 @@ private:
class Q_AUTOTEST_EXPORT QDeclarativePathPercent : public QDeclarativePathElement
{
Q_OBJECT
- Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY changed)
+ Q_PROPERTY(qreal value READ value WRITE setValue)
public:
QDeclarativePathPercent(QObject *parent=0) : QDeclarativePathElement(parent) {}
diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h
index 481c36c..d15d1f6 100644
--- a/src/declarative/util/qdeclarativeanimation_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p.h
@@ -74,7 +74,7 @@ class Q_AUTOTEST_EXPORT QDeclarativeAbstractAnimation : public QObject, public Q
Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged)
Q_PROPERTY(bool paused READ isPaused WRITE setPaused NOTIFY pausedChanged)
Q_PROPERTY(bool alwaysRunToEnd READ alwaysRunToEnd WRITE setAlwaysRunToEnd NOTIFY alwaysRunToEndChanged)
- Q_PROPERTY(int loops READ loops WRITE setLoops NOTIFY loopsChanged)
+ Q_PROPERTY(int loops READ loops WRITE setLoops NOTIFY loopCountChanged)
Q_CLASSINFO("DefaultMethod", "start()")
public:
@@ -301,8 +301,8 @@ class Q_AUTOTEST_EXPORT QDeclarativeColorAnimation : public QDeclarativeProperty
{
Q_OBJECT
Q_DECLARE_PRIVATE(QDeclarativePropertyAnimation)
- Q_PROPERTY(QColor from READ from WRITE setFrom NOTIFY fromChanged)
- Q_PROPERTY(QColor to READ to WRITE setTo NOTIFY toChanged)
+ Q_PROPERTY(QColor from READ from WRITE setFrom)
+ Q_PROPERTY(QColor to READ to WRITE setTo)
public:
QDeclarativeColorAnimation(QObject *parent=0);
@@ -320,8 +320,8 @@ class Q_AUTOTEST_EXPORT QDeclarativeNumberAnimation : public QDeclarativePropert
Q_OBJECT
Q_DECLARE_PRIVATE(QDeclarativePropertyAnimation)
- Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged)
- Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged)
+ Q_PROPERTY(qreal from READ from WRITE setFrom)
+ Q_PROPERTY(qreal to READ to WRITE setTo)
public:
QDeclarativeNumberAnimation(QObject *parent=0);
@@ -345,8 +345,8 @@ class Q_AUTOTEST_EXPORT QDeclarativeVector3dAnimation : public QDeclarativePrope
Q_OBJECT
Q_DECLARE_PRIVATE(QDeclarativePropertyAnimation)
- Q_PROPERTY(QVector3D from READ from WRITE setFrom NOTIFY fromChanged)
- Q_PROPERTY(QVector3D to READ to WRITE setTo NOTIFY toChanged)
+ Q_PROPERTY(QVector3D from READ from WRITE setFrom)
+ Q_PROPERTY(QVector3D to READ to WRITE setTo)
public:
QDeclarativeVector3dAnimation(QObject *parent=0);
@@ -366,8 +366,8 @@ class Q_AUTOTEST_EXPORT QDeclarativeRotationAnimation : public QDeclarativePrope
Q_DECLARE_PRIVATE(QDeclarativeRotationAnimation)
Q_ENUMS(RotationDirection)
- Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged)
- Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged)
+ Q_PROPERTY(qreal from READ from WRITE setFrom)
+ Q_PROPERTY(qreal to READ to WRITE setTo)
Q_PROPERTY(RotationDirection direction READ direction WRITE setDirection NOTIFY directionChanged)
public:
diff --git a/src/declarative/util/qdeclarativefontloader_p.h b/src/declarative/util/qdeclarativefontloader_p.h
index 6947547..a5fbb8f 100644
--- a/src/declarative/util/qdeclarativefontloader_p.h
+++ b/src/declarative/util/qdeclarativefontloader_p.h
@@ -60,7 +60,7 @@ class Q_AUTOTEST_EXPORT QDeclarativeFontLoader : public QObject
Q_DECLARE_PRIVATE(QDeclarativeFontLoader)
Q_ENUMS(Status)
- Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+ Q_PROPERTY(QUrl source READ source WRITE setSource)
Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
Q_PROPERTY(Status status READ status NOTIFY statusChanged)
719-2884/+2885 * Merge branch '4.5' into 4.6Thiago Macieira2009-09-034-0/+163 |\ | * Add missing license headersJason McDonald2009-09-034-0/+164 * | XQuery: allow usage of floats in QXmlQueryPeter Hartmann2009-09-031-6/+12 * | Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-31101-1313/+1313 * | Merge branch '4.5' into 4.6Thiago Macieira2009-08-31614-8008/+8008 |\ \ | |/ | * Update tech preview license header.Jason McDonald2009-08-31603-7865/+7865 * | Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-61/+0 |\ \ | |/ | * Fix license headers.Jason McDonald2009-08-311-61/+0 * | Fix some missing and duplicated license headers.Jason McDonald2009-08-271-51/+0 * | Merge branch '4.5' into 4.6Thiago Macieira2009-08-243-3/+4 |\ \ | |/ | * Fixed compile error with gcc 4.3.3Thorbjørn Lindeijer2009-08-241-1/+1 | * Fixed commentThorbjørn Lindeijer2009-08-241-1/+1 | * Make assorted constructors follow good coding practiceKeith Isdale2009-08-242-1/+2 | * Update old email address.Jason McDonald2009-08-11283-529/+529 | * Qt's domain name is now qt.nokia.com.Jason McDonald2009-08-111-1/+1 | * Update license headers.Jason McDonald2009-08-11603-606/+606 * | Merge commit 'qt/master'Jason Barron2009-08-202-104/+189 |\ \ | * | Generate proper license header.Frans Englich2009-08-192-104/+189 * | | Fixed xmlpatterns review comments.Janne Anttila2009-08-193-19/+0 * | | Merge commit 'qt/master'Jason Barron2009-08-184-7/+6 |\ \ \ | |/ / | * | Restructure the documentation, both on a file and on a content level.Volker Hilsheimer2009-08-173-6/+3 | * | QVariant: more work on avoinding conversion between float and doublesThierry Bastian2009-08-141-1/+3 * | | Merge commit 'qt/master'Jason Barron2009-08-13714-1348/+1347 |\ \ \ | |/ / | * | Replace "Trolltech" with more appropriate terms.Jason McDonald2009-08-123-3/+2 | * | Update obsolete email addresses.Jason McDonald2009-08-12326-572/+572 | * | Eliminate last mentions of "Qt Software".Jason McDonald2009-08-1254-54/+54 | * | Update URL's to use new domain.Jason McDonald2009-08-121-1/+1 | * | Update contact URL in license headers.Jason McDonald2009-08-12