aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2013-11-20 13:34:52 -0500
committerJake Petroules <jake.petroules@petroules.com>2013-11-21 18:03:53 +0100
commite81fda6169fae5b4949e7f4ee75d1528b016d5e7 (patch)
tree46a4fc2089756961557541f7a71a04251b30bcc0
parentb9aca56026562b0fd6ff2fd2717e20666f40b98a (diff)
Fix minor issues in the CocoaApplication example.
Change-Id: Idd2a49381f013710d72e05d9b1781b47ce70750f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rw-r--r--examples/cocoa-application/CocoaApplication.qbs4
-rw-r--r--examples/cocoa-application/CocoaApplication/AppDelegate.h2
-rw-r--r--examples/cocoa-application/CocoaApplication/AppDelegate.m2
3 files changed, 6 insertions, 2 deletions
diff --git a/examples/cocoa-application/CocoaApplication.qbs b/examples/cocoa-application/CocoaApplication.qbs
index b41ac938e..99ee60d9d 100644
--- a/examples/cocoa-application/CocoaApplication.qbs
+++ b/examples/cocoa-application/CocoaApplication.qbs
@@ -1,6 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Petroules Corporation.
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Build Suite.
@@ -43,7 +44,7 @@ CppApplication {
type: "applicationbundle"
name: "CocoaApplication"
- cpp.precompiledHeader: "CocoaApplication-Prefix.pch"
+ cpp.precompiledHeader: "CocoaApplication/CocoaApplication-Prefix.pch"
cpp.infoPlistFile: "CocoaApplication/CocoaApplication-Info.plist"
@@ -54,6 +55,7 @@ CppApplication {
files: [
"AppDelegate.h",
"AppDelegate.m",
+ "CocoaApplication-Prefix.pch",
"main.m"
]
}
diff --git a/examples/cocoa-application/CocoaApplication/AppDelegate.h b/examples/cocoa-application/CocoaApplication/AppDelegate.h
index 1b556ce2d..d6757555e 100644
--- a/examples/cocoa-application/CocoaApplication/AppDelegate.h
+++ b/examples/cocoa-application/CocoaApplication/AppDelegate.h
@@ -31,6 +31,6 @@
@interface AppDelegate : NSObject <NSApplicationDelegate>
-@property (assign) IBOutlet NSWindow *window;
+@property (nonatomic, assign) IBOutlet NSWindow *window;
@end
diff --git a/examples/cocoa-application/CocoaApplication/AppDelegate.m b/examples/cocoa-application/CocoaApplication/AppDelegate.m
index 8db0bec8d..0cbf74dd8 100644
--- a/examples/cocoa-application/CocoaApplication/AppDelegate.m
+++ b/examples/cocoa-application/CocoaApplication/AppDelegate.m
@@ -31,6 +31,8 @@
@implementation AppDelegate
+@synthesize window = _window;
+
- (void)dealloc
{
[super dealloc];