summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@digia.com>2014-01-08 11:35:30 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-10 17:15:21 +0100
commit263fdd15da120c664de9ab6c43932a70cda9997b (patch)
treeae4ffccf4c4f5f499102b43201b87157c1c4e93e
parent6fd205d579ff53eb846ce5e15e558d4ea0e90823 (diff)
downloadqtbase-263fdd15da120c664de9ab6c43932a70cda9997b.tar.gz
qtbase-263fdd15da120c664de9ab6c43932a70cda9997b.tar.bz2
qtbase-263fdd15da120c664de9ab6c43932a70cda9997b.zip
Don't force create the platform window.
This causes all sorts of unintended side effects and is generally a bad idea. Task-number: QTBUG-32988 Change-Id: Iebdae34764be4cfd9ced47aa93789871e0455ab3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
-rw-r--r--src/plugins/platforms/cocoa/qcocoanativeinterface.mm5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
index 795d1a8149..6facab1785 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
@@ -268,11 +268,6 @@ void QCocoaNativeInterface::registerTouchWindow(QWindow *window, bool enable)
if (!window)
return;
- // Make sure the QCocoaWindow is created when enabling. Disabling might
- // happen on window destruction, don't (re)create the QCocoaWindow then.
- if (enable)
- window->create();
-
QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(window->handle());
if (cocoaWindow)
cocoaWindow->registerTouch(enable);