Skip to content

Commit 2831f84

Browse files
committed
Fix compilation
1 parent 6efe160 commit 2831f84

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/core/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -1113,8 +1113,6 @@ IF (WIN32)
11131113
TARGET_LINK_LIBRARIES(qgis_core wsock32 ${SETUPAPI_LIBRARY} DbgHelp)
11141114
ENDIF (WIN32)
11151115
1116-
TARGET_LINK_LIBRARIES(qgis_core qgis_native)
1117-
11181116
IF (NOT WITH_INTERNAL_QEXTSERIALPORT)
11191117
TARGET_LINK_LIBRARIES(qgis_core ${QEXTSERIALPORT_LIBRARY})
11201118
ENDIF (NOT WITH_INTERNAL_QEXTSERIALPORT)

src/gui/qgsgui.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
#include "qgseditorwidgetregistry.h"
2020
#include "qgslayertreeembeddedwidgetregistry.h"
2121
#include "qgsmaplayeractionregistry.h"
22+
#ifdef Q_OS_MACX
23+
#include "qgsmacnative.h"
24+
#else
2225
#include "qgsnative.h"
26+
#endif
2327
#include "qgsshortcutsmanager.h"
2428

2529
QgsGui *QgsGui::instance()

0 commit comments

Comments
 (0)