summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2017-09-08 13:30:57 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-09-08 12:05:17 +0000
commitff9080e74062f5409eebd7dcb823a1a7d9bf2bf7 (patch)
treecfd17d4b6a3b118e89d98b57c5fb0cd96aff45e5
parent1af927976ac953f922e35d71a16a32d328bb2efd (diff)
macOS: Remove QMacRootLevelAutoReleasePool member from QCoreApplication
Tying the pool to the lifetime of QCoreApplication becomes a problem when the application is allocated on the heap, for example when Qt is used to create plugins, as NSAutoreleasePool should be allocated and drained in the same context, typically a function scope. The feature is disabled for now, until we can find a better way to achieve the same thing. Change-Id: I600587df62a8cc7caded5172ad914c0e04d794d9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-rw-r--r--src/corelib/kernel/qcoreapplication_p.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h
index 963aec70e8..cd995c17f1 100644
--- a/src/corelib/kernel/qcoreapplication_p.h
+++ b/src/corelib/kernel/qcoreapplication_p.h
@@ -89,10 +89,6 @@ public:
QString appName() const;
QString appVersion() const;
-#ifdef Q_OS_MACOS
- QMacRootLevelAutoReleasePool autoReleasePool;
-#endif
-
#ifdef Q_OS_DARWIN
static QString infoDictionaryStringProperty(const QString &propertyName);
#endif