From 68b42cd595954b3c1579e30907dc78c181f0701c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@digia.com>
Date: Mon, 2 Sep 2013 13:49:24 +0200
Subject: Port QMacCocoaViewContainer to Qt 5.

Includes example.

Change-Id: Ifdda5c535d0ec41694712405d921b2c32cb8dfc8
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
---
 examples/widgets/mac/mac.pro                       |  6 +-
 .../widgets/mac/qmaccocoaviewcontainer/main.mm     | 67 ++++++++++++++++++++++
 .../qmaccocoaviewcontainer.pro                     |  7 +++
 3 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 examples/widgets/mac/qmaccocoaviewcontainer/main.mm
 create mode 100644 examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro

(limited to 'examples')

diff --git a/examples/widgets/mac/mac.pro b/examples/widgets/mac/mac.pro
index c5f8bf826f..1513c66ed8 100644
--- a/examples/widgets/mac/mac.pro
+++ b/examples/widgets/mac/mac.pro
@@ -1,5 +1,7 @@
 TEMPLATE = subdirs
+
 macx {
     SUBDIRS = \
-            qmacnativewidget
-}
\ No newline at end of file
+        qmacnativewidget \
+        qmacnativewidget
+}
diff --git a/examples/widgets/mac/qmaccocoaviewcontainer/main.mm b/examples/widgets/mac/qmaccocoaviewcontainer/main.mm
new file mode 100644
index 0000000000..e8ebc23714
--- /dev/null
+++ b/examples/widgets/mac/qmaccocoaviewcontainer/main.mm
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtMacExtras module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtWidgets>
+#include <Cocoa/Cocoa.h>
+#include <QMacCocoaViewContainer>
+
+class WindowWidget : public QWidget
+{
+public:
+    WindowWidget()
+    {
+        QMacCocoaViewContainer *cocoaViewContainer = new QMacCocoaViewContainer(0, this);
+        cocoaViewContainer->move(100, 100);
+        cocoaViewContainer->resize(300, 300);
+        NSTextView *text = [[NSTextView alloc] initWithFrame : NSMakeRect(0, 0, 300, 300)];
+        cocoaViewContainer->setCocoaView(text);
+    }
+};
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    WindowWidget widget;
+    widget.show();
+
+    return app.exec();
+}
diff --git a/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro b/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro
new file mode 100644
index 0000000000..c8c2195cb8
--- /dev/null
+++ b/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro
@@ -0,0 +1,7 @@
+TEMPLATE = app
+
+OBJECTIVE_SOURCES += main.mm
+LIBS += -framework Cocoa
+
+QT += widgets
+
-- 
cgit v1.2.1