Merge branch 'master' of github.com:qgis/Quantum-GIS

Author: etiennesky

.gitignore

@@ -43,3 +43,4 @@ scripts/RelWithDebInfo
 /CMakeLists.txt.user
 qgis-test.ctest
 i18n/*.qm
+.project

CMakeLists.txt

@@ -559,6 +559,12 @@ ADD_CUSTOM_TARGET(version ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h)
 #############################################################
 # process subdirs
 
+#create a variable to specify where our test data is
+#so that unit tests can use TEST_DATA_DIR to locate
+#the test data. See CMakeLists in test dirs for more info
+#TEST_DATA_DIR is also used by QgsRenderChecker currently in core
+SET (TEST_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata")
+
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(doc)
 ADD_SUBDIRECTORY(images)
@@ -570,10 +576,6 @@ IF (WITH_BINDINGS)
 ENDIF (WITH_BINDINGS)
 
 IF (ENABLE_TESTS)
-  #create a variable to specify where our test data is
-  #so that unit tests can use TEST_DATA_DIR to locate
-  #the test data. See CMakeLists in test dirs for more info
-  SET (TEST_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata")
   ADD_SUBDIRECTORY(tests)
   SET (CTEST_BINARY_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/bin" )
   MESSAGE (STATUS "Ctest Binary Directory  set to: ${CTEST_BINARY_DIRECTORY}")

doc/CONTRIBUTORS

@@ -39,6 +39,7 @@ Mark Baas
 Markus Neteler
 Mathias Walker
 Matt Amos
+Matthias Kuhn
 Maurizio Napolitano
 Mayeul Kauffmann
 Milena Nowotarska

images/images.qrc

@@ -462,6 +462,9 @@
     <file>flags/en_US.png</file>
     <file>flags/da_DK.png</file>
     <file>flags/et_EE.png</file>
+    <file>themes/default/text.png</file>
+    <file>themes/default/histogram.png</file>
+    <file>themes/default/pie-chart.png</file>
   </qresource>
   <qresource prefix="/images/tips">
     <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>