summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qcocoapanel_mac_p.h
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eblomfel@trolltech.com>2010-02-15 10:22:25 (GMT)
committerEskil Abrahamsen Blomfeldt <eblomfel@trolltech.com>2010-02-15 10:22:25 (GMT)
commit8197e5fae939c264220666162fe9ecb624e47bef (patch)
tree08ad63b681ff701d568d771784c97be1c6274dbd /src/gui/kernel/qcocoapanel_mac_p.h
parent9f387357a7e171636c97a7ef13afca60c01a9e3b (diff)
parent4a47bf6a06a4f7ebbf2336cd643c50332ac76d6d (diff)
downloadQt-8197e5fae939c264220666162fe9ecb624e47bef.zip
Qt-8197e5fae939c264220666162fe9ecb624e47bef.tar.gz
Qt-8197e5fae939c264220666162fe9ecb624e47bef.tar.bz2
Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7
Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qlineedit/tst_qlineedit.cpp Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qlineedit/tst_qlineedit.cpp Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qlineedit/tst_qlineedit.cpp
Diffstat (limited to 'src/gui/kernel/qcocoapanel_mac_p.h')
-rw-r--r--src/gui/kernel/qcocoapanel_mac_p.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qcocoapanel_mac_p.h b/src/gui/kernel/qcocoapanel_mac_p.h
index fc83bd8..3678f81 100644
--- a/src/gui/kernel/qcocoapanel_mac_p.h
+++ b/src/gui/kernel/qcocoapanel_mac_p.h
@@ -54,10 +54,16 @@
#ifdef QT_MAC_USE_COCOA
#import <Cocoa/Cocoa.h>
+QT_FORWARD_DECLARE_CLASS(QStringList);
+
@interface QT_MANGLE_NAMESPACE(QCocoaPanel) : NSPanel {
bool leftButtonIsRightButton;
+ QStringList *currentCustomDragTypes;
}
+ (Class)frameViewClassForStyleMask:(NSUInteger)styleMask;
+- (void)registerDragTypes;
+
@end
#endif
+