Skip to content
Permalink
Browse files

fixed failing qgis_composerpicturetest, 17cb59f and e9817d5 followup

  • Loading branch information
blazek committed Sep 23, 2015
1 parent e9817d5 commit 7dd53025c345e12a923165312c563dd315849aa0
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/app/CMakeLists.txt
@@ -505,9 +505,9 @@ ENDIF (POSTGRES_FOUND)

#############
IF (ANDROID)
ADD_LIBRARY(${QGIS_APP_NAME} SHARED main.cpp)
ADD_LIBRARY(${QGIS_APP_NAME} SHARED main.cpp ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS})
ELSE (ANDROID)
ADD_EXECUTABLE(${QGIS_APP_NAME} MACOSX_BUNDLE WIN32 main.cpp)
ADD_EXECUTABLE(${QGIS_APP_NAME} MACOSX_BUNDLE WIN32 main.cpp ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS})
ENDIF (ANDROID)

IF (NOT MSVC)
@@ -518,8 +518,8 @@ IF (NOT MSVC)
ENDIF (NOT MSVC)
ADD_DEFINITIONS("\"-DAPP_EXPORT=${DLLEXPORT}\"")

# shared library used by tests - TODO: use it also for qgis executable?
ADD_LIBRARY(qgis_app SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS} ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS})
# Putting IMAGE_RCC_SRCS into qgis_app lib is cousing problems when the lib is loaded (by plugin for example) in test unit (qgis_composerpicturetest).
ADD_LIBRARY(qgis_app SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS})

TARGET_LINK_LIBRARIES(qgis_app
${QWT_LIBRARY}

2 comments on commit 7dd5302

@nyalldawson

This comment has been minimized.

Copy link
Collaborator

@nyalldawson nyalldawson replied Sep 23, 2015

@blazek hmm, this is odd. I have a sneaking suspicion that the failure was actually the correct behaviour here (showing the cross image), but I'll need to investigate. What should be happening is that an invalid expression or expression which evaluates to a missing file shows the cross, but an expression which evaluates to null shows no picture. I'll look into this.

@blazek

This comment has been minimized.

Copy link
Member Author

@blazek blazek replied Sep 24, 2015

It is giving the red x (which is considered fail by current test) only if qgis_app lib contains ${IMAGE_RCC_SRCS} and if qgis_app lib is loaded during the test (if a provider/plugin is linked to qgis_app (currently GRASS plugin).

Please sign in to comment.
You can’t perform that action at this time.