custom widget lib: include resources to show icons in designer

3nids · 3nids · commit 1cba39da6fc6 · 2014-08-20T11:02:24.000+02:00
diff --git a/src/customwidgets/CMakeLists.txt b/src/customwidgets/CMakeLists.txt
@@ -77,7 +77,10 @@ INCLUDE_DIRECTORIES(
 #############################################################
 # qgis_customwidgets library
 
-ADD_LIBRARY(qgis_customwidgets SHARED ${QGIS_CUSTOMWIDGETS_SRCS} ${QGIS_CUSTOMWIDGETS_MOC_SRCS} ${QGIS_CUSTOMWIDGETS_HDRS})
+SET(IMAGE_RCCS ../../images/images.qrc)
+QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
+
+ADD_LIBRARY(qgis_customwidgets SHARED ${QGIS_CUSTOMWIDGETS_SRCS} ${QGIS_CUSTOMWIDGETS_MOC_SRCS} ${QGIS_CUSTOMWIDGETS_HDRS} ${IMAGE_RCC_SRCS})
 
 # TODO: apple
 INSTALL(FILES ${QGIS_CUSTOMWIDGETS_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -108,9 +108,10 @@ QgsRelationReferenceWidget::QgsRelationReferenceWidget( QWidget* parent )
   mAttributeEditorFrame->setLayout( mAttributeEditorLayout );
   mTopLayout->addWidget( mAttributeEditorFrame );
 
-  // default mode is combobox, non geometric relation and no embed form
+  // default mode is combobox, no geometric relation and no embed form
   mLineEdit->hide();
   mMapIdentificationButton->hide();
+  mHighlightFeatureButton->hide();
   mAttributeEditorFrame->hide();
 }
 
