diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-09 23:14:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-10 06:56:10 +0000 |
| commit | 45e1372e1969d840d709cef0d1b64df897038b02 (patch) | |
| tree | 6fbe2788a9052390d938ee5080cb76eac5a3ae59 /examples | |
| parent | e16dffd3e0e8dbc1aadb686b6c502944d9557de9 (diff) | |
Examples: fix a function name conflict with QtWidget
Task-number: QTBUG-43213
Change-Id: Ieb1482dd619c7df64cc56b34abdf1e0518c9df14
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/macextras/embeddedqwindow/main.mm | 4 |
1 files changed, 2 insertions, 2 deletions
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 |