diff options
Diffstat (limited to 'examples/widgets/widgets/icons')
-rw-r--r-- | examples/widgets/widgets/icons/icons.pro | 11 | ||||
-rw-r--r-- | examples/widgets/widgets/icons/iconsizespinbox.h | 4 | ||||
-rw-r--r-- | examples/widgets/widgets/icons/imagedelegate.h | 6 |
3 files changed, 5 insertions, 16 deletions
diff --git a/examples/widgets/widgets/icons/icons.pro b/examples/widgets/widgets/icons/icons.pro index 4ee95592c8..450bdf9f8a 100644 --- a/examples/widgets/widgets/icons/icons.pro +++ b/examples/widgets/widgets/icons/icons.pro @@ -17,14 +17,3 @@ EXAMPLE_FILES = images/* # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/icons INSTALLS += target - - -wince { - imageFiles.files = images/* - wincewm*: { - imageFiles.path = "/My Documents/My Pictures" - } else { - imageFiles.path = images - } - INSTALLS += imageFiles -} diff --git a/examples/widgets/widgets/icons/iconsizespinbox.h b/examples/widgets/widgets/icons/iconsizespinbox.h index 1bbd2f793f..96a56e75c9 100644 --- a/examples/widgets/widgets/icons/iconsizespinbox.h +++ b/examples/widgets/widgets/icons/iconsizespinbox.h @@ -61,8 +61,8 @@ class IconSizeSpinBox : public QSpinBox public: explicit IconSizeSpinBox(QWidget *parent = Q_NULLPTR); - int valueFromText(const QString &text) const Q_DECL_OVERRIDE; - QString textFromValue(int value) const Q_DECL_OVERRIDE; + int valueFromText(const QString &text) const override; + QString textFromValue(int value) const override; }; //! [0] diff --git a/examples/widgets/widgets/icons/imagedelegate.h b/examples/widgets/widgets/icons/imagedelegate.h index 28822d01fb..928085d85b 100644 --- a/examples/widgets/widgets/icons/imagedelegate.h +++ b/examples/widgets/widgets/icons/imagedelegate.h @@ -64,10 +64,10 @@ public: //! [1] QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; - void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; void setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; //! [1] //! [2] private slots: |