diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-29 22:49:55 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-29 22:50:23 +0100 |
| commit | 75b42f18d886b59dbf3380dd12f39f40005ef08b (patch) | |
| tree | cd1cb5699064fa897f11d9f9f4923c0c0f05d95a /src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h | |
| parent | 43203140461174071f7a3e68bf388a6522556810 (diff) | |
| parent | a6ca348636dd92ab1445cff2286b3293163f5cea (diff) | |
| download | qt-creator-75b42f18d886b59dbf3380dd12f39f40005ef08b.tar.gz | |
Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
Diffstat (limited to 'src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h')
| -rw-r--r-- | src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h index 7da8f9d4b4..2ff94fac60 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h @@ -77,7 +77,7 @@ private: class PropertyEditorValue : public QObject -{ +{ Q_OBJECT Q_PROPERTY(QVariant value READ value WRITE setValueWithEmit NOTIFY valueChanged) Q_PROPERTY(QString expression READ expression WRITE setExpressionWithEmit NOTIFY expressionChanged FINAL) |