diff options
author | Liang Qi <liang.qi@qt.io> | 2019-12-16 07:05:19 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-12-16 07:05:19 +0100 |
commit | ee71a9ba8169b9327b8dbaf2266ebeb515c64dbb (patch) | |
tree | a2eb41c9b1b47ac8cd6f22c289f7227569ee0a5a /examples/widgets/widgets/styles/norwegianwoodstyle.cpp | |
parent | d6266c757d2f2ea4ff1e71dc8545f9bf97aa3bb1 (diff) | |
parent | 98f19f00361bf25097281cae5dfa833ba7db8a2f (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/network/ssl/qsslsocket.cpp
src/widgets/kernel/qapplication.cpp
Change-Id: Ib7421cc2df59d0969f89b3fbd65a17ea76ffef3b
Diffstat (limited to 'examples/widgets/widgets/styles/norwegianwoodstyle.cpp')
-rw-r--r-- | examples/widgets/widgets/styles/norwegianwoodstyle.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/widgets/widgets/styles/norwegianwoodstyle.cpp b/examples/widgets/widgets/styles/norwegianwoodstyle.cpp index 0f614a2e9a..bbdb626a18 100644 --- a/examples/widgets/widgets/styles/norwegianwoodstyle.cpp +++ b/examples/widgets/widgets/styles/norwegianwoodstyle.cpp @@ -58,6 +58,7 @@ NorwegianWoodStyle::NorwegianWoodStyle() : QProxyStyle(QStyleFactory::create("windows")) { + setObjectName("NorwegianWood"); } //! [0] |