diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-24 17:45:21 +0200 |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-24 17:45:21 +0200 |
| commit | 8e6569663ecbf7389b3df5d86f4ce2d1102b16c0 (patch) | |
| tree | 290fe9c4af570126949093affc25c7a9fb84e8ed /src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp | |
| parent | 1cbc4116d3c6fa1320ee4523e45a5f0df004cd3a (diff) | |
| parent | e5076cc5e50be46b2f2a2307660e5e8603b780ad (diff) | |
| download | qt-creator-8e6569663ecbf7389b3df5d86f4ce2d1102b16c0.tar.gz | |
Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline into 2.0
Diffstat (limited to 'src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp index 839a3b2138..e5c86aa385 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp @@ -123,7 +123,7 @@ class QWidgetDeclarativeUI : public QObject Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged) Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged) - Q_PROPERTY(QUrl styleSheetFile READ styleSheetFile WRITE setStyleSheetFile NOTIFY styleSheetFileChanged) + Q_PROPERTY(QUrl styleSheetFile READ styleSheetFile WRITE setStyleSheetFile) Q_PROPERTY(QColor windowColor READ windowColor WRITE setWindowColor) Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor) @@ -782,7 +782,7 @@ private: class QComboBoxDeclarativeUI : public QObject { Q_OBJECT - Q_PROPERTY(QStringList items READ items WRITE setItems NOTIFY itemChanged) + Q_PROPERTY(QStringList items READ items WRITE setItems) Q_PROPERTY(QString currentText READ currentText WRITE setCurrentText NOTIFY currentTextChanged) public: @@ -879,7 +879,7 @@ class WidgetLoader : public QWidget Q_PROPERTY(QString sourceString READ sourceString WRITE setSourceString NOTIFY sourceChanged) Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(QUrl baseUrl READ baseUrl WRITE setBaseUrl) - Q_PROPERTY(QString qmlData READ qmlData WRITE setQmlData NOTIFY sourceQmlDataChanged) + Q_PROPERTY(QString qmlData READ qmlData WRITE setQmlData NOTIFY qmlDataChanged) Q_PROPERTY(QWidget *widget READ widget NOTIFY widgetChanged) Q_PROPERTY(QDeclarativeComponent *component READ component NOTIFY sourceChanged) |