diff options
| author | Debao Zhang <dbzhang800@gmail.com> | 2012-03-17 22:59:10 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-19 18:02:47 +0100 |
| commit | 478658fd41dba6c0d94edfbe31086dc3cabff533 (patch) | |
| tree | eb032c1e11a6016a144dd07e059fda118128e1a2 /src/widgets/widgets | |
| parent | 4bcd8fc2dee683da632466e6de5d782f52263951 (diff) | |
QtWidgets: cleanup several Q3* items
Change-Id: I0812cdd74f19b4c98336724ea722807d4c68cf7d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qframe.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qmenubar_p.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/widgets/widgets/qframe.cpp b/src/widgets/widgets/qframe.cpp index 29c213f7af..b69f65828b 100644 --- a/src/widgets/widgets/qframe.cpp +++ b/src/widgets/widgets/qframe.cpp @@ -486,7 +486,7 @@ void QFrame::paintEvent(QPaintEvent *) /*! \internal - Mostly for the sake of Q3Frame + Used by QLabel and QLCDNumber */ void QFrame::drawFrame(QPainter *p) { diff --git a/src/widgets/widgets/qmenubar_p.h b/src/widgets/widgets/qmenubar_p.h index 9e1d3179c7..139f5703de 100644 --- a/src/widgets/widgets/qmenubar_p.h +++ b/src/widgets/widgets/qmenubar_p.h @@ -53,7 +53,6 @@ // We mean it. // -#ifndef QMAC_Q3MENUBAR_CPP_FILE #include "QtWidgets/qstyleoption.h" #include <private/qmenu_p.h> // Mac needs what in this file! @@ -190,7 +189,6 @@ public: QAction *menuBarAction; #endif }; -#endif #endif // QT_NO_MENUBAR |