Merge branch 'master' of git://github.com/commontk/CTK

CMake/ctkDashboardDriverScript.cmake

@@ -59,7 +59,10 @@ foreach(var ${expected_variables})
   endif()
 endforeach()
 
-set(git_repository http://github.com/commontk/CTK.git)
+# If the dashscript doesn't define a GIT_REPOSITORY variable, let's define it here.
+if (NOT DEFINED GIT_REPOSITORY OR GIT_REPOSITORY STREQUAL "")
+  set(GIT_REPOSITORY http://github.com/commontk/CTK.git)
+endif()
 
 # Should binary directory be cleaned?
 set(empty_binary_directory FALSE)
@@ -98,7 +101,7 @@ if(empty_binary_directory)
 endif()
 
 if(NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")
-  set(CTEST_CHECKOUT_COMMAND "${CTEST_GIT_COMMAND} clone ${git_repository} ${CTEST_SOURCE_DIRECTORY}")
+  set(CTEST_CHECKOUT_COMMAND "${CTEST_GIT_COMMAND} clone ${GIT_REPOSITORY} ${CTEST_SOURCE_DIRECTORY}")
 endif()
 
 set(CTEST_UPDATE_COMMAND "${CTEST_GIT_COMMAND}")

CMake/ctkDashboardScript.EXAMPLE.cmake

@@ -77,6 +77,11 @@ find_program(CTEST_COVERAGE_COMMAND NAMES gcov)
 find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
 find_program(CTEST_GIT_COMMAND NAMES git)
 
+#
+# Git repository - Overwrite the default value provided by the driver script
+#
+# set(GIT_REPOSITORY http://github.com/YOURUSERNAME/CTK.git)
+
 ##########################################
 # WARNING: DO NOT EDIT BEYOND THIS POINT #
 ##########################################

CMakeLists.txt

@@ -217,11 +217,8 @@ MARK_AS_ADVANCED(ADDITIONAL_CXX_FLAGS)
 #-----------------------------------------------------------------------------
 # Set symbol visibility Flags
 #
-IF(CMAKE_CXX_COMPILER_ID)
-  # Set the default symbol visibility to hidden for gcc
-  IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    SET(VISIBILITY_CXX_FLAGS "-fvisibility=hidden -fvisibility-inlines-hidden")
-  ENDIF()
+IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  SET(VISIBILITY_CXX_FLAGS "-fvisibility=hidden -fvisibility-inlines-hidden")
 ENDIF()
 
 #-----------------------------------------------------------------------------

Libs/Widgets/ctkTransferFunctionItem.cpp

@@ -322,7 +322,7 @@ QPointF ctkTransferFunctionItem::screen2TransferFunctionCoordinates( qreal x, qr
 QVariant ctkTransferFunctionItem::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant& value)
 {
   QVariant res = this->QGraphicsObject::itemChange(change, value);
-  if (change == QGraphicsItem::ItemSceneChange && this->scene())
+  if (change == QGraphicsItem::ItemSceneHasChanged && this->scene())
     {
     connect(this->transferFunction(),SIGNAL(changed()),
             this->scene(), SLOT(update()),Qt::UniqueConnection);