Skip to content

Commit 093eb41

Browse files
committed
include image resource in gui tests (perhaps fixes trusty nightly tests)
1 parent f2a05f2 commit 093eb41

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

tests/src/gui/CMakeLists.txt

+9-6
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,13 @@ ENDIF (APPLE)
8686
# ADD_TEST(qgis_quickprinttest ${CMAKE_INSTALL_PREFIX}/bin/qgis_quickprinttest)
8787
#ENDIF (APPLE)
8888
89+
SET(IMAGE_RCCS ../../../images/images.qrc)
90+
QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
91+
8992
MACRO (ADD_QGIS_TEST testname testsrc)
9093
SET(qgis_${testname}_SRCS ${testsrc} ${util_SRCS})
9194
SET(qgis_${testname}_MOC_CPPS ${testsrc})
92-
ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
95+
ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS} ${IMAGE_RCC_SRCS})
9396
SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES AUTOMOC TRUE)
9497
TARGET_LINK_LIBRARIES(qgis_${testname}
9598
${QT_QTXML_LIBRARY}
@@ -122,13 +125,13 @@ ADD_QGIS_TEST(zoomtest testqgsmaptoolzoom.cpp)
122125
123126
#ADD_QGIS_TEST(histogramtest testqgsrasterhistogram.cpp)
124127
ADD_QGIS_TEST(doublespinbox testqgsdoublespinbox.cpp)
125-
ADD_QGIS_TEST(dualviewtest testqgsdualview.cpp )
126-
ADD_QGIS_TEST(fieldexpressionwidget testqgsfieldexpressionwidget.cpp )
127-
ADD_QGIS_TEST(filewidget testqgsfilewidget.cpp )
128-
ADD_QGIS_TEST(mapcanvastest testqgsmapcanvas.cpp )
128+
ADD_QGIS_TEST(dualviewtest testqgsdualview.cpp)
129+
ADD_QGIS_TEST(fieldexpressionwidget testqgsfieldexpressionwidget.cpp)
130+
ADD_QGIS_TEST(filewidget testqgsfilewidget.cpp)
131+
ADD_QGIS_TEST(mapcanvastest testqgsmapcanvas.cpp)
129132
ADD_QGIS_TEST(projectionissues testprojectionissues.cpp)
130133
ADD_QGIS_TEST(qgsguitest testqgsgui.cpp)
131-
ADD_QGIS_TEST(rubberbandtest testqgsrubberband.cpp )
134+
ADD_QGIS_TEST(rubberbandtest testqgsrubberband.cpp)
132135
ADD_QGIS_TEST(scalecombobox testqgsscalecombobox.cpp)
133136
ADD_QGIS_TEST(spinbox testqgsspinbox.cpp)
134137

0 commit comments

Comments
 (0)