summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@digia.com>2013-04-12 11:46:28 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-15 10:28:23 +0200
commit11fdd8edcd6a45f5e6bb1cd6e02b06d8f61eb406 (patch)
tree56b6f86a63c80d19f94bef284998480c8904b1a8 /src/plugins
parent2da29c97364b5f4226bc6e943097c8bb2245b5a6 (diff)
Cocoa: Create QCocoaWindow when enabling touch.
The ref-counting and (native) touch enabling is implemented in QCocoaWindow. Change-Id: I4f3f5e16db59afec7dd7dd2f8360dd60b90bfe6d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/cocoa/qcocoanativeinterface.mm5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
index f0f1f56d90..5368b2f938 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
@@ -228,6 +228,11 @@ void QCocoaNativeInterface::setWindowContentView(QPlatformWindow *window, void *
void QCocoaNativeInterface::registerTouchWindow(QWindow *window, bool enable)
{
+ // 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);