diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-04 11:33:10 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-04 17:38:40 +0200 |
| commit | 0f7987f0c934b311bd39a5a496ffb0c6128eb8df (patch) | |
| tree | dea392deb3c43e377a224271c4f450dcff3fc76f /src/widgets/doc/snippets/customviewstyle.cpp | |
| parent | ea7d85457d30e915ad470919d2e74867cba9cad8 (diff) | |
| parent | f0ea852d4dd6b3139869a952ee92e74cd367866d (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/text/qlocale.cpp
src/network/access/qnetworkaccessmanager.cpp
Regenerated tests/auto/testlib/selftests/float/CMakeLists.txt
Change-Id: I5a8ae42511380ca49a38b13c6fa8a3c5df8bed01
Diffstat (limited to 'src/widgets/doc/snippets/customviewstyle.cpp')
| -rw-r--r-- | src/widgets/doc/snippets/customviewstyle.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/widgets/doc/snippets/customviewstyle.cpp b/src/widgets/doc/snippets/customviewstyle.cpp index b9c10cb31d8..1e4cf2b711a 100644 --- a/src/widgets/doc/snippets/customviewstyle.cpp +++ b/src/widgets/doc/snippets/customviewstyle.cpp @@ -50,11 +50,10 @@ #include <QtWidgets> -#include "customviewstyle.h" +#include "./customstyle/customstyle.h" - - -void CustomViewStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const +void CustomStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *option, + QPainter *painter, const QWidget *widget) const { //![0] |