Skip to content
Permalink
Browse files
Fix compilation
  • Loading branch information
nyalldawson committed May 15, 2017
1 parent 6efe160 commit 2831f842e66a03eba64134f6e64adb922346eba4
Showing with 4 additions and 2 deletions.
  1. +0 −2 src/core/CMakeLists.txt
  2. +4 −0 src/gui/qgsgui.cpp
@@ -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)
@@ -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()

0 comments on commit 2831f84

Please sign in to comment.