diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:31 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:53 +0200 |
| commit | 6e5818f2bbc8443b9308252a5e1543e014ef439d (patch) | |
| tree | 07922adee2f13e818b9439c8a0bdf871dda59039 /src/widgets/styles/qmacstyle_mac.h | |
| parent | 32aac0a1c009ee940920fd12f277180dd80b8eff (diff) | |
| parent | deac55becd18efa4504eb686a1bb8081a5cd488a (diff) | |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
Diffstat (limited to 'src/widgets/styles/qmacstyle_mac.h')
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/styles/qmacstyle_mac.h b/src/widgets/styles/qmacstyle_mac.h index 50eff86ec0..60d5ec21eb 100644 --- a/src/widgets/styles/qmacstyle_mac.h +++ b/src/widgets/styles/qmacstyle_mac.h @@ -42,7 +42,7 @@ #ifndef QMACSTYLE_MAC_H #define QMACSTYLE_MAC_H -#include <QtWidgets/qwindowsstyle.h> +#include <QtWidgets/qcommonstyle.h> QT_BEGIN_HEADER @@ -62,7 +62,7 @@ class QPalette; class QPushButton; class QStyleOptionButton; class QMacStylePrivate; -class Q_WIDGETS_EXPORT_STYLE_MAC QMacStyle : public QWindowsStyle +class Q_WIDGETS_EXPORT_STYLE_MAC QMacStyle : public QCommonStyle { Q_OBJECT public: |