diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2010-10-20 13:33:15 +0200 |
|---|---|---|
| committer | Fabien Freling <fabien.freling@nokia.com> | 2010-10-20 13:33:40 +0200 |
| commit | 065ce8db6ff006c465bc6909c99836f5349d6a5d (patch) | |
| tree | 22d98ef4bd460552ae088400e0891699e457029c | |
| parent | 8705b07a8b6a723ff620f8593e24916ddac70e9d (diff) | |
| download | qt4-tools-065ce8db6ff006c465bc6909c99836f5349d6a5d.tar.gz | |
Fix the #ifdef position.
Reviewed-by: Tor Arne Vestbø
| -rw-r--r-- | src/gui/painting/qunifiedtoolbarsurface_mac.cpp | 4 | ||||
| -rw-r--r-- | src/gui/painting/qunifiedtoolbarsurface_mac_p.h | 4 | ||||
| -rw-r--r-- | src/gui/widgets/qmainwindowlayout_p.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp index b90b061c63..ab05dbdc09 100644 --- a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp +++ b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp @@ -39,14 +39,14 @@ ** ****************************************************************************/ -#ifdef QT_MAC_USE_COCOA - #include "qunifiedtoolbarsurface_mac_p.h" #include <private/qt_cocoa_helpers_mac_p.h> #include <private/qbackingstore_p.h> #include <QDebug> +#ifdef QT_MAC_USE_COCOA + QT_BEGIN_NAMESPACE QUnifiedToolbarSurface::QUnifiedToolbarSurface(QWidget *widget) diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h index c2ec854d22..4d72ff9f54 100644 --- a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h +++ b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h @@ -53,13 +53,13 @@ // We mean it. // -#ifdef QT_MAC_USE_COCOA - #include <private/qwindowsurface_raster_p.h> #include <QWidget> #include <private/qwidget_p.h> #include <private/qnativeimage_p.h> +#ifdef QT_MAC_USE_COCOA + QT_BEGIN_NAMESPACE class QNativeImage; diff --git a/src/gui/widgets/qmainwindowlayout_p.h b/src/gui/widgets/qmainwindowlayout_p.h index 3eb2545013..e882d118e7 100644 --- a/src/gui/widgets/qmainwindowlayout_p.h +++ b/src/gui/widgets/qmainwindowlayout_p.h @@ -342,7 +342,10 @@ public: void syncUnifiedToolbarVisibility(); bool blockVisiblityCheck; +#ifdef QT_MAC_USE_COCOA QUnifiedToolbarSurface *unifiedSurface; +#endif // QT_MAC_USE_COCOA + #endif // Q_WS_MAC }; QT_END_NAMESPACE |