diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:48:33 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:48:33 +0100 |
| commit | bb3872d60975724a50ff910b6dd108d1944db597 (patch) | |
| tree | ce1c96729a1a4691a322b36cfd5429c020403ccc /src/plugins/styles/mac/qmacstyle_mac_p.h | |
| parent | b72b5cd76004e54dc00c0f1133f4d59192ef154a (diff) | |
| parent | 8e387e7fa758ded3f0d096dcf5fe13a22521dad7 (diff) | |
Merge 5.10 into 5.10.0
Change-Id: Ibfbaa8ef89cf45b87a2c65f1da4a708e5464f259
Diffstat (limited to 'src/plugins/styles/mac/qmacstyle_mac_p.h')
| -rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/styles/mac/qmacstyle_mac_p.h b/src/plugins/styles/mac/qmacstyle_mac_p.h index 6011baeea2..d6874001d3 100644 --- a/src/plugins/styles/mac/qmacstyle_mac_p.h +++ b/src/plugins/styles/mac/qmacstyle_mac_p.h @@ -117,10 +117,6 @@ public: private: Q_DISABLE_COPY(QMacStyle) Q_DECLARE_PRIVATE(QMacStyle) - -#if QT_CONFIG(pushbutton) - friend bool qt_mac_buttonIsRenderedFlat(const QPushButton *pushButton, const QStyleOptionButton *option); -#endif }; QT_END_NAMESPACE |