Skip to content

Commit a893f52

Browse files
committedAug 3, 2018
fix mac build and fix native file selector
1 parent 970fc4f commit a893f52

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed
 

‎src/native/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ ELSE(NOT APPLE)
116116
FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
117117
MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
118118
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
119-
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_native
119+
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis3_native
120120
BUILD_WITH_INSTALL_RPATH TRUE
121121
PUBLIC_HEADER "${QGIS_NATIVE_HDRS}"
122122
LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}"

‎src/native/mac/qgsmacnative.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
#include "qgsnative.h"
2222

23+
class QString;
24+
25+
2326
class NATIVE_EXPORT QgsMacNative : public QgsNative
2427
{
2528
public:

‎src/native/mac/qgsmacnative.mm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@
1818
#include "qgsmacnative.h"
1919

2020
#include <Cocoa/Cocoa.h>
21+
#include <QString>
2122

2223
QgsMacNative::~QgsMacNative()
2324
{
2425
}
2526

26-
const char* QgsMacNative::currentAppLocalizedName()
27+
const char *QgsMacNative::currentAppLocalizedName()
2728
{
2829
return [[[NSRunningApplication currentApplication] localizedName] UTF8String];
2930
}
3031

3132
void QgsMacNative::currentAppActivateIgnoringOtherApps()
3233
{
33-
// valid for Mac OS X >= 10.6
3434
[[NSRunningApplication currentApplication] activateWithOptions:
35-
(NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)];
35+
( NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps )];
3636
}
3737

38-
void openFileExplorerAndSelectFile( const QString &path )
38+
void QgsMacNative::openFileExplorerAndSelectFile( const QString &path )
3939
{
40-
NSString* pathStr = [[NSString alloc] initWithUTF8String:path.toUtf8().data()];
41-
NSArray *fileURLs = [NSArray arrayWithObjects:pathStr, /* ... */ nil];
40+
NSString *pathStr = [[NSString alloc] initWithUTF8String:path.toUtf8().data()];
41+
NSArray *fileURLs = [NSArray arrayWithObjects:[NSURL fileURLWithPath:pathStr], nil];
4242
[[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:fileURLs];
4343
}

0 commit comments

Comments
 (0)