summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication_p.h
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-08-17 02:58:26 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-08-17 02:58:26 (GMT)
commit65d6e2c443ea31886de14736b21953fb8695eaf7 (patch)
tree45be09de909749ff10350fdc2377c4dbf3e815d8 /src/gui/kernel/qapplication_p.h
parent6eab5d70003fe18ada199009d4b636765c609786 (diff)
parent72c1cb2ffdfb2742985e12025d4578aa2fe80ce7 (diff)
downloadQt-65d6e2c443ea31886de14736b21953fb8695eaf7.zip
Qt-65d6e2c443ea31886de14736b21953fb8695eaf7.tar.gz
Qt-65d6e2c443ea31886de14736b21953fb8695eaf7.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/gui/kernel/qapplication_p.h')
-rw-r--r--src/gui/kernel/qapplication_p.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index c90ebfe..5d409f4 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -484,12 +484,6 @@ public:
void _q_alertTimeOut();
QHash<QWidget *, QTimer *> alertTimerHash;
#endif
-#if defined(QT_MAC_USE_COCOA)
- void _q_runAppModalWindow();
-#endif
-#if defined(QT_MAC_USE_COCOA)
- void _q_runModalWindow();
-#endif
#ifndef QT_NO_STYLE_STYLESHEET
static QString styleSheet;
#endif