diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2013-04-30 17:39:19 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-08 14:07:41 +0200 |
commit | 3e44a72ae725110a78ff570c67071c3451428d75 (patch) | |
tree | 3dcd0c121a23e2e6aa97e68179aaba2544fef458 /src/widgets | |
parent | cfaa98011b95a8b102da3e550478a5f14a427875 (diff) |
Remove references to inexisting enums in Q_ENUMS
moc currently silently ignores them, but I have a version which display
a warning.
Change-Id: I9a239cb7e99d40a57a013fb66357c4a6426d6e8b
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/kernel/qformlayout.h | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qfontcombobox.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/widgets/kernel/qformlayout.h b/src/widgets/kernel/qformlayout.h index d59f71eb32..a1356c734f 100644 --- a/src/widgets/kernel/qformlayout.h +++ b/src/widgets/kernel/qformlayout.h @@ -52,7 +52,7 @@ class QFormLayoutPrivate; class Q_WIDGETS_EXPORT QFormLayout : public QLayout { Q_OBJECT - Q_ENUMS(FormStyle FieldGrowthPolicy RowWrapPolicy ItemRole) + Q_ENUMS(FieldGrowthPolicy RowWrapPolicy ItemRole) Q_DECLARE_PRIVATE(QFormLayout) Q_PROPERTY(FieldGrowthPolicy fieldGrowthPolicy READ fieldGrowthPolicy WRITE setFieldGrowthPolicy RESET resetFieldGrowthPolicy) Q_PROPERTY(RowWrapPolicy rowWrapPolicy READ rowWrapPolicy WRITE setRowWrapPolicy RESET resetRowWrapPolicy) diff --git a/src/widgets/widgets/qfontcombobox.h b/src/widgets/widgets/qfontcombobox.h index 66fc9b4581..8b3170eb5b 100644 --- a/src/widgets/widgets/qfontcombobox.h +++ b/src/widgets/widgets/qfontcombobox.h @@ -59,7 +59,6 @@ class Q_WIDGETS_EXPORT QFontComboBox : public QComboBox Q_PROPERTY(QFontDatabase::WritingSystem writingSystem READ writingSystem WRITE setWritingSystem) Q_PROPERTY(FontFilters fontFilters READ fontFilters WRITE setFontFilters) Q_PROPERTY(QFont currentFont READ currentFont WRITE setCurrentFont NOTIFY currentFontChanged) - Q_ENUMS(FontSelection) public: explicit QFontComboBox(QWidget *parent = 0); |