diff options
Diffstat (limited to 'src/widgets/widgets/qmainwindowlayout_p.h')
-rw-r--r-- | src/widgets/widgets/qmainwindowlayout_p.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index 9a13e5f5ce..b718a0ca4f 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -60,18 +60,6 @@ #include "qdockarealayout_p.h" #include "qtoolbararealayout_p.h" -#ifdef Q_DEAD_CODE_FROM_QT4_MAC -// Forward defs to make avoid including Carbon.h (faster compile you know ;). -struct OpaqueHIObjectRef; -typedef struct OpaqueHIObjectRef* HIObjectRef; -typedef HIObjectRef HIToolbarItemRef; -typedef const void * CFTypeRef; -typedef const struct __CFString * CFStringRef; - -#include <private/qunifiedtoolbarsurface_mac_p.h> - -#endif // Q_DEAD_CODE_FROM_QT4_MAC - QT_BEGIN_NAMESPACE class QToolBar; @@ -275,7 +263,7 @@ public: // save/restore - enum { // sentinel values used to validate state data + enum VersionMarkers { // sentinel values used to validate state data VersionMarker = 0xff }; void saveState(QDataStream &stream) const; |