Fix compilation

qgis · May 15, 2017 · 2831f84 · 2831f84
1 parent 6efe160
commit 2831f84
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -1113,8 +1113,6 @@ IF (WIN32)
   TARGET_LINK_LIBRARIES(qgis_core wsock32 ${SETUPAPI_LIBRARY} DbgHelp)
 ENDIF (WIN32)
 
-TARGET_LINK_LIBRARIES(qgis_core qgis_native)
-
 IF (NOT WITH_INTERNAL_QEXTSERIALPORT)
   TARGET_LINK_LIBRARIES(qgis_core ${QEXTSERIALPORT_LIBRARY})
 ENDIF (NOT WITH_INTERNAL_QEXTSERIALPORT)

diff --git a/src/gui/qgsgui.cpp b/src/gui/qgsgui.cpp
@@ -19,7 +19,11 @@
 #include "qgseditorwidgetregistry.h"
 #include "qgslayertreeembeddedwidgetregistry.h"
 #include "qgsmaplayeractionregistry.h"
+#ifdef Q_OS_MACX
+#include "qgsmacnative.h"
+#else
 #include "qgsnative.h"
+#endif
 #include "qgsshortcutsmanager.h"
 
 QgsGui *QgsGui::instance()