fix mac build and fix native file selector

qgis · Aug 3, 2018 · a893f52 · a893f52 · nyalldawson · Aug 3, 2018
1 parent 970fc4f
commit a893f52
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/native/CMakeLists.txt b/src/native/CMakeLists.txt
@@ -116,7 +116,7 @@ ELSE(NOT APPLE)
     FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
     MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
     MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
-    MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_native
+    MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis3_native
     BUILD_WITH_INSTALL_RPATH TRUE
     PUBLIC_HEADER "${QGIS_NATIVE_HDRS}"
     LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}"

diff --git a/src/native/mac/qgsmacnative.h b/src/native/mac/qgsmacnative.h
@@ -20,6 +20,9 @@
 
 #include "qgsnative.h"
 
+class QString;
+
+
 class NATIVE_EXPORT QgsMacNative : public QgsNative
 {
   public:

diff --git a/src/native/mac/qgsmacnative.mm b/src/native/mac/qgsmacnative.mm
@@ -18,26 +18,26 @@
 #include "qgsmacnative.h"
 
 #include <Cocoa/Cocoa.h>
+#include <QString>
 
 QgsMacNative::~QgsMacNative()
 {
 }
 
-const char* QgsMacNative::currentAppLocalizedName()
+const char *QgsMacNative::currentAppLocalizedName()
 {
   return [[[NSRunningApplication currentApplication] localizedName] UTF8String];
 }
 
 void QgsMacNative::currentAppActivateIgnoringOtherApps()
 {
-  // valid for Mac OS X >= 10.6
   [[NSRunningApplication currentApplication] activateWithOptions:
-    (NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)];
+                                             ( NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps )];
 }
 
-void openFileExplorerAndSelectFile( const QString &path )
+void QgsMacNative::openFileExplorerAndSelectFile( const QString &path )
 {
-  NSString* pathStr = [[NSString alloc] initWithUTF8String:path.toUtf8().data()];
-  NSArray *fileURLs = [NSArray arrayWithObjects:pathStr, /* ... */ nil];
+  NSString *pathStr = [[NSString alloc] initWithUTF8String:path.toUtf8().data()];
+  NSArray *fileURLs = [NSArray arrayWithObjects:[NSURL fileURLWithPath:pathStr], nil];
   [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:fileURLs];
 }