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/styleplugin/plugin/simplestyleplugin.cpp | |
| parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
| parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'examples/widgets/tools/styleplugin/plugin/simplestyleplugin.cpp')
| -rw-r--r-- | examples/widgets/tools/styleplugin/plugin/simplestyleplugin.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/examples/widgets/tools/styleplugin/plugin/simplestyleplugin.cpp b/examples/widgets/tools/styleplugin/plugin/simplestyleplugin.cpp index 344e46061c..cbe7c15cc0 100644 --- a/examples/widgets/tools/styleplugin/plugin/simplestyleplugin.cpp +++ b/examples/widgets/tools/styleplugin/plugin/simplestyleplugin.cpp @@ -48,15 +48,13 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "simplestyleplugin.h" #include "simplestyle.h" //! [0] QStringList SimpleStylePlugin::keys() const { - return QStringList() << "SimpleStyle"; + return {"SimpleStyle"}; } //! [0] @@ -65,6 +63,6 @@ QStyle *SimpleStylePlugin::create(const QString &key) { if (key.toLower() == "simplestyle") return new SimpleStyle; - return 0; + return nullptr; } //! [1] |