From 45e1372e1969d840d709cef0d1b64df897038b02 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@theqtcompany.com>
Date: Tue, 9 Jun 2015 23:14:44 +0200
Subject: Examples: fix a function name conflict with QtWidget

Task-number: QTBUG-43213
Change-Id: Ieb1482dd619c7df64cc56b34abdf1e0518c9df14
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
---
 examples/macextras/embeddedqwindow/main.mm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'examples')

diff --git a/examples/macextras/embeddedqwindow/main.mm b/examples/macextras/embeddedqwindow/main.mm
index ca1f2ff..3774a90 100644
--- a/examples/macextras/embeddedqwindow/main.mm
+++ b/examples/macextras/embeddedqwindow/main.mm
@@ -39,7 +39,7 @@
 #include <qpa/qplatformnativeinterface.h>
 
 
-NSView *getEmbeddableView(QWindow *qtWindow)
+NSView *myGetEmbeddableView(QWindow *qtWindow)
 {
     // Make sure the platform window is created
     qtWindow->create();
@@ -75,7 +75,7 @@ NSView *getEmbeddableView(QWindow *qtWindow)
 
     // Create the QWindow and embed its view.
     Window *qtWindow = new Window(); // ### who owns this window?
-    NSView *qtView = getEmbeddableView(qtWindow);
+    NSView *qtView = myGetEmbeddableView(qtWindow);
     [window setContentView:qtView];
 
     // Show the NSWindow
-- 
cgit v1.2.3