Skip to content

Commit

Permalink
fixed failing qgis_composerpicturetest, 17cb59f and e9817d5 followup
Browse files Browse the repository at this point in the history
  • Loading branch information
@blazek
blazek committed Sep 23, 2015
1 parent e9817d5 commit 7dd5302
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/app/CMakeLists.txt
View file
Expand Up @@ -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)
Expand All @@ -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}
Expand Down

2 comments on commit 7dd5302

@nyalldawson
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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
Copy link
Member Author

@blazek blazek commented on 7dd5302 Sep 24, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.