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/tools/plugandpaint/plugins/basictools | |
| parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
| parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'examples/widgets/tools/plugandpaint/plugins/basictools')
| -rw-r--r-- | examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp | 6 | ||||
| -rw-r--r-- | examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp index 3b465565ba..64f9f7a0d9 100644 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp @@ -50,10 +50,10 @@ #include "basictoolsplugin.h" +#include <QInputDialog> +#include <QPainter> +#include <QRandomGenerator> #include <QtMath> -#include <QtWidgets> - -#include <stdlib.h> //! [0] QStringList BasicToolsPlugin::brushes() const diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h index fd9bb9e5f3..1d9d170daa 100644 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h @@ -54,12 +54,12 @@ //! [0] #include <interfaces.h> -#include <QRect> +#include <QImage> #include <QObject> -#include <QtPlugin> -#include <QStringList> #include <QPainterPath> -#include <QImage> +#include <QRect> +#include <QStringList> +#include <QtPlugin> //! [1] class BasicToolsPlugin : public QObject, |