Changeset 846 for trunk/src/gui/kernel/qcocoaapplication_mac.mm
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/gui/kernel/qcocoaapplication_mac.mm
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) … … 80 80 #include <private/qt_cocoa_helpers_mac_p.h> 81 81 82 83 82 84 @implementation NSApplication (QT_MANGLE_NAMESPACE(QApplicationIntegration)) 83 85 … … 108 110 } 109 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 110 137 @end 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 111 157 #endif
Note:
See TracChangeset
for help on using the changeset viewer.