diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-11 16:44:18 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-11 16:44:33 +0200 |
| commit | 7ffbfed7c791b1c8e514b5c9d24e8b80de3f21c2 (patch) | |
| tree | 216fe013c8ff61451fab97781a73bc8d20dab187 /examples | |
| parent | 857c82f8a4a29399733218f783241b839b939f58 (diff) | |
| parent | 4b43a5d528ab8d6edec5c9faaa40354edea0dd67 (diff) | |
Merge remote-tracking branch 'origin/stable' into 5.3
Change-Id: I147a75ac74bd7b19dbeb99e1ec2836cc5bfc2806
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/mac/mac.pro | 2 | ||||
| -rw-r--r-- | examples/widgets/mac/qmaccocoaviewcontainer/main.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/mac/mac.pro b/examples/widgets/mac/mac.pro index 1513c66ed8..7f8f79120d 100644 --- a/examples/widgets/mac/mac.pro +++ b/examples/widgets/mac/mac.pro @@ -2,6 +2,6 @@ TEMPLATE = subdirs macx { SUBDIRS = \ - qmacnativewidget \ + qmaccocoaviewcontainer \ qmacnativewidget } diff --git a/examples/widgets/mac/qmaccocoaviewcontainer/main.mm b/examples/widgets/mac/qmaccocoaviewcontainer/main.mm index e8ebc23714..e13273ce31 100644 --- a/examples/widgets/mac/qmaccocoaviewcontainer/main.mm +++ b/examples/widgets/mac/qmaccocoaviewcontainer/main.mm @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <QtWidgets> #include <Cocoa/Cocoa.h> +#include <QtWidgets> #include <QMacCocoaViewContainer> class WindowWidget : public QWidget |