diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-12-07 22:29:43 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-12-07 22:29:43 (GMT) |
| commit | ef5850afa68f148ab72d46bf64a8a1be1a70bb3b (patch) | |
| tree | be4d94ab6c8cfa6710ff4c2fb5f4dcfa4e364871 /src/gui/kernel/qcocoawindow_mac_p.h | |
| parent | 29e5c9b27302e455b1ae9d324687ded3a40066d2 (diff) | |
| parent | 0a9aa40dd9865e61f2799a6396ce8dcaa68329c5 (diff) | |
| download | Qt-ef5850afa68f148ab72d46bf64a8a1be1a70bb3b.zip Qt-ef5850afa68f148ab72d46bf64a8a1be1a70bb3b.tar.gz Qt-ef5850afa68f148ab72d46bf64a8a1be1a70bb3b.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlengine.cpp
Diffstat (limited to 'src/gui/kernel/qcocoawindow_mac_p.h')
| -rw-r--r-- | src/gui/kernel/qcocoawindow_mac_p.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/kernel/qcocoawindow_mac_p.h b/src/gui/kernel/qcocoawindow_mac_p.h index a688d96..91c5d4e 100644 --- a/src/gui/kernel/qcocoawindow_mac_p.h +++ b/src/gui/kernel/qcocoawindow_mac_p.h @@ -50,13 +50,18 @@ // We mean it. // -#include "qmacdefines_mac.h" #ifdef QT_MAC_USE_COCOA +#include "qmacdefines_mac.h" #import <Cocoa/Cocoa.h> enum { QtMacCustomizeWindow = 1 << 21 }; // This will one day be run over by QT_FORWARD_DECLARE_CLASS(QWidget); +QT_FORWARD_DECLARE_CLASS(QStringList); + +@interface NSWindow (QtCoverForHackWithCategory) ++ (Class)frameViewClassForStyleMask:(NSUInteger)styleMask; +@end @interface NSWindow (QT_MANGLE_NAMESPACE(QWidgetIntegration)) - (id)QT_MANGLE_NAMESPACE(qt_initWithQWidget):(QWidget *)widget contentRect:(NSRect)rect styleMask:(NSUInteger)mask; @@ -70,3 +75,4 @@ QT_FORWARD_DECLARE_CLASS(QWidget); + (Class)frameViewClassForStyleMask:(NSUInteger)styleMask; @end #endif + |