diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:16 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:34 +0200 |
commit | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (patch) | |
tree | 896fa81adb8b14a69355a3a6cf64d06ec8173c9a /examples/widgets/widgets/icons | |
parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'examples/widgets/widgets/icons')
4 files changed, 23 insertions, 7 deletions
diff --git a/examples/widgets/widgets/icons/iconpreviewarea.cpp b/examples/widgets/widgets/icons/iconpreviewarea.cpp index 7a73a137cd..96cb6f008e 100644 --- a/examples/widgets/widgets/icons/iconpreviewarea.cpp +++ b/examples/widgets/widgets/icons/iconpreviewarea.cpp @@ -50,7 +50,8 @@ #include "iconpreviewarea.h" -#include <QtWidgets> +#include <QGridLayout> +#include <QLabel> //! [0] IconPreviewArea::IconPreviewArea(QWidget *parent) diff --git a/examples/widgets/widgets/icons/iconsizespinbox.cpp b/examples/widgets/widgets/icons/iconsizespinbox.cpp index e94d943993..8e6c654686 100644 --- a/examples/widgets/widgets/icons/iconsizespinbox.cpp +++ b/examples/widgets/widgets/icons/iconsizespinbox.cpp @@ -50,7 +50,7 @@ #include "iconsizespinbox.h" -#include <QtWidgets> +#include <QRegularExpression> //! [0] IconSizeSpinBox::IconSizeSpinBox(QWidget *parent) diff --git a/examples/widgets/widgets/icons/imagedelegate.cpp b/examples/widgets/widgets/icons/imagedelegate.cpp index 786194bae7..39c2e43134 100644 --- a/examples/widgets/widgets/icons/imagedelegate.cpp +++ b/examples/widgets/widgets/icons/imagedelegate.cpp @@ -51,7 +51,7 @@ #include "imagedelegate.h" #include "iconpreviewarea.h" -#include <QtWidgets> +#include <QComboBox> //! [0] ImageDelegate::ImageDelegate(QObject *parent) diff --git a/examples/widgets/widgets/icons/mainwindow.cpp b/examples/widgets/widgets/icons/mainwindow.cpp index 91e98ff896..f342c18c4c 100644 --- a/examples/widgets/widgets/icons/mainwindow.cpp +++ b/examples/widgets/widgets/icons/mainwindow.cpp @@ -48,14 +48,29 @@ ** ****************************************************************************/ -#include <QtWidgets> - +#include "mainwindow.h" #include "iconpreviewarea.h" #include "iconsizespinbox.h" #include "imagedelegate.h" -#include "mainwindow.h" -#include <memory> +#include <QApplication> +#include <QButtonGroup> +#include <QCheckBox> +#include <QFileDialog> +#include <QHeaderView> +#include <QFormLayout> +#include <QGridLayout> +#include <QGroupBox> +#include <QImageReader> +#include <QLabel> +#include <QMenuBar> +#include <QMessageBox> +#include <QRadioButton> +#include <QScreen> +#include <QStandardPaths> +#include <QStyleFactory> +#include <QTableWidget> +#include <QWindow> //! [40] enum { OtherSize = QStyle::PM_CustomBase }; |