diff options
author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-05-25 10:27:18 (GMT) |
---|---|---|
committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-05-25 10:27:18 (GMT) |
commit | 0dff624cc550254b804540b77b9ddd3c41a26f16 (patch) | |
tree | ed4b7815c0bdf13c1cffd9af6d13f79c4b28e5e2 /src/gui/styles/qmacstyle_mac.h | |
parent | b5702253a08e315b4db5620a1d4b0ffd4c8e0d0f (diff) | |
parent | 2447c023bc0113bace6f31d93ea942f7b8cb17da (diff) | |
download | Qt-0dff624cc550254b804540b77b9ddd3c41a26f16.zip Qt-0dff624cc550254b804540b77b9ddd3c41a26f16.tar.gz Qt-0dff624cc550254b804540b77b9ddd3c41a26f16.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/styles/qmacstyle_mac.h')
-rw-r--r-- | src/gui/styles/qmacstyle_mac.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/gui/styles/qmacstyle_mac.h b/src/gui/styles/qmacstyle_mac.h index e594793..bcebb1d 100644 --- a/src/gui/styles/qmacstyle_mac.h +++ b/src/gui/styles/qmacstyle_mac.h @@ -120,17 +120,6 @@ public: bool event(QEvent *e); - // Ideally these wouldn't exist, but since they already exist we need some accessors. - static const int PushButtonLeftOffset; - static const int PushButtonTopOffset; - static const int PushButtonRightOffset; - static const int PushButtonBottomOffset; - static const int MiniButtonH; - static const int SmallButtonH; - static const int BevelButtonW; - static const int BevelButtonH; - static const int PushButtonContentPadding; - protected Q_SLOTS: QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0, const QWidget *widget = 0) const; |