summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>2010-01-13 11:25:30 (GMT)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>2010-01-13 12:00:47 (GMT)
commit20e0e7a849d70139f9106f60c78fd0c736ec3c4b (patch)
tree1694e05b8b0bd2ead4c948a59389459cca5eb144
parent52ecdf550a57906a01580c2f811a4035414f0c8b (diff)
downloadQt-20e0e7a849d70139f9106f60c78fd0c736ec3c4b.zip
Qt-20e0e7a849d70139f9106f60c78fd0c736ec3c4b.tar.gz
Qt-20e0e7a849d70139f9106f60c78fd0c736ec3c4b.tar.bz2
Revert "Add an autorelease pool to QApplication instance."
This reverts commit 705ebaea0d81c76c97e7230f0acbe85442981555. For some strange reason, the change that we revert caused a lot of problems; the menu bar stopped working, duplicating menu items etc., and modality stopped working correctly. So there is only one thing to do: revert. Rev-By: msorvig
-rw-r--r--src/gui/kernel/qapplication_p.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 2927c45..2404d91 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -74,9 +74,6 @@
#ifdef Q_OS_SYMBIAN
#include <w32std.h>
#endif
-#ifdef Q_WS_MAC
-#include <private/qt_mac_p.h>
-#endif
QT_BEGIN_NAMESPACE
@@ -487,13 +484,6 @@ public:
static Qt::NavigationMode navigationMode;
#endif
-// We need to have an autorelease pool in place in order
-// to catch releases done in between creating the QApplication
-// instance and calling QApplicaiton::exec();
-#if defined(QT_MAC_USE_COCOA)
- QMacCocoaAutoReleasePool pool;
-#endif
-
#if defined(Q_WS_MAC) || defined(Q_WS_X11)
void _q_alertTimeOut();
QHash<QWidget *, QTimer *> alertTimerHash;