diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-13 19:45:20 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-03-13 19:45:20 +0000 |
| commit | 77e71dac1607232160006579420df8b603118462 (patch) | |
| tree | 8fe71cc79127465f63944eb0dd48a00478546f57 /src/widgets/styles | |
| parent | 70e772079f4943822cc469ef83fb9c43afc36514 (diff) | |
| parent | d51c3ecf8ef6e28557c66745f50a223cc5b1ce54 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
Diffstat (limited to 'src/widgets/styles')
| -rw-r--r-- | src/widgets/styles/qfusionstyle.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac.mm | 10 | ||||
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac_p_p.h | 1 | ||||
| -rw-r--r-- | src/widgets/styles/qwindowsvistastyle_p_p.h | 1 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index 02e0ad2a9b..98d45587f0 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -56,7 +56,6 @@ #include <qmainwindow.h> #include <qfont.h> #include <qgroupbox.h> -#include <qprocess.h> #include <qpixmapcache.h> #include <qscrollbar.h> #include <qspinbox.h> @@ -67,7 +66,6 @@ #include <qsplitter.h> #include <qprogressbar.h> #include <qwizard.h> -#include <qlibrary.h> #include <qdrawutil.h> #include <private/qstylehelper_p.h> #include <private/qdrawhelper_p.h> diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index ae536b6bd9..a9aab10e0f 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -6744,7 +6744,15 @@ QSize QMacStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, break; } case CT_Menu: { - sz = csz; + if (proxy() == this) { + sz = csz; + } else { + QStyleHintReturnMask menuMask; + QStyleOption myOption = *opt; + myOption.rect.setSize(sz); + if (proxy()->styleHint(SH_Menu_Mask, &myOption, widget, &menuMask)) + sz = menuMask.region.boundingRect().size(); + } break; } case CT_HeaderSection:{ const QStyleOptionHeader *header = qstyleoption_cast<const QStyleOptionHeader *>(opt); diff --git a/src/widgets/styles/qmacstyle_mac_p_p.h b/src/widgets/styles/qmacstyle_mac_p_p.h index 59f6e893b1..9bbd0995a5 100644 --- a/src/widgets/styles/qmacstyle_mac_p_p.h +++ b/src/widgets/styles/qmacstyle_mac_p_p.h @@ -95,7 +95,6 @@ #include <qtableview.h> #include <qwizard.h> #include <qdebug.h> -#include <qlibrary.h> #include <qdatetimeedit.h> #include <qmath.h> #include <qpair.h> diff --git a/src/widgets/styles/qwindowsvistastyle_p_p.h b/src/widgets/styles/qwindowsvistastyle_p_p.h index ec7c2caad3..db358e6f6c 100644 --- a/src/widgets/styles/qwindowsvistastyle_p_p.h +++ b/src/widgets/styles/qwindowsvistastyle_p_p.h @@ -58,7 +58,6 @@ #include <private/qwindowsxpstyle_p_p.h> #include <private/qstyleanimation_p.h> #include <private/qpaintengine_raster_p.h> -#include <qlibrary.h> #include <qpaintengine.h> #include <qwidget.h> #include <qapplication.h> |