Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/qgis/QGIS

  • Loading branch information
pcav committed May 25, 2016
2 parents 98ede7f + 0469ffc commit 92604cf20703ec39be77527f1a4281698764a445
Showing with 9,325 additions and 1,538 deletions.
  1. +21 −9 CMakeLists.txt
  2. +2 −4 ci/travis/linux/qt4/script.sh
  3. +0 −5 ci/travis/linux/qt5/blacklist.txt
  4. +4 −5 ci/travis/linux/qt5/script.sh
  5. +7 −2 cmake/PyQtMacros.cmake
  6. +2 −0 cmake_templates/qgsconfig.h.in
  7. +4 −0 images/images.qrc
  8. +158 −0 images/themes/default/styleicons/multibandcolor.svg
  9. +98 −0 images/themes/default/styleicons/paletted.svg
  10. +93 −0 images/themes/default/styleicons/singlebandgray.svg
  11. +105 −0 images/themes/default/styleicons/singlebandpseudocolor.svg
  12. +3 −6 python/PyQt/PyQt5/QtCore.py
  13. +4 −2 python/core/composer/qgscomposerattributetable.sip
  14. +12 −2 python/core/composer/qgscomposerattributetablev2.sip
  15. +4 −2 python/core/composer/qgscomposertable.sip
  16. +5 −2 python/core/composer/qgscomposertexttable.sip
  17. +3 −5 python/core/raster/qgsrasterblock.sip
  18. +4 −0 python/core/symbology-ng/qgssymbolv2.sip
  19. +19 −0 python/gui/attributetable/qgsdualview.sip
  20. +133 −0 python/gui/editorwidgets/core/qgssearchwidgetwrapper.sip
  21. +48 −0 python/gui/editorwidgets/qgscheckboxsearchwidgetwrapper.sip
  22. +4 −0 python/gui/editorwidgets/qgsdatetimeedit.sip
  23. +46 −0 python/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.sip
  24. +46 −0 python/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.sip
  25. +42 −0 python/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip
  26. +97 −0 python/gui/editorwidgets/qgssearchwidgettoolbutton.sip
  27. +34 −0 python/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.sip
  28. +39 −0 python/gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.sip
  29. +9 −0 python/gui/gui.sip
  30. +28 −1 python/gui/qgsattributeform.sip
  31. +56 −4 python/gui/qgsattributeformeditorwidget.sip
  32. +29 −0 python/gui/qgscolorbuttonv2.sip
  33. +7 −0 python/gui/raster/qgsrasterhistogramwidget.sip
  34. +8 −0 python/gui/raster/qgsrasterrendererwidget.sip
  35. +33 −0 python/gui/raster/qgsrastertransparencywidget.sip
  36. +43 −0 python/gui/raster/qgsrendererrasterpropertieswidget.sip
  37. +1 −1 python/plugins/GdalTools/tools/widgetMerge.ui
  38. +1 −1 python/plugins/processing/algs/gdal/merge.py
  39. +2 −1 python/plugins/processing/algs/grass/GrassAlgorithmProvider.py
  40. +0 −1 python/plugins/processing/algs/grass7/Grass7Algorithm.py
  41. +3 −0 python/plugins/processing/algs/otb/OTBUtils.py
  42. +11 −4 python/plugins/processing/algs/qgis/CreateConstantRaster.py
  43. +8 −0 python/plugins/processing/algs/qgis/ImportIntoPostGIS.py
  44. +18 −3 python/plugins/processing/algs/r/RAlgorithm.py
  45. +3 −0 python/plugins/processing/algs/saga/SagaUtils.py
  46. +2 −1 python/plugins/processing/core/parameters.py
  47. +4 −2 python/plugins/processing/gui/AlgorithmDialog.py
  48. +2 −0 python/plugins/processing/gui/OutputSelectionPanel.py
  49. +1 −1 python/plugins/processing/modeler/ModelerParametersDialog.py
  50. +2 −0 python/plugins/processing/tests/AlgorithmsTestBase.py
  51. +25 −1 python/plugins/processing/tests/ParametersTest.py
  52. +0 −21 python/plugins/processing/tests/testdata/expected/basic_statistics_numeric_float.html
  53. +21 −2 python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
  54. +9 −5 python/plugins/processing/tools/raster.py
  55. +2 −1 resources/function_help/json/x
  56. +2 −1 resources/function_help/json/y
  57. +6 −6 src/analysis/vector/qgsgeometryanalyzer.cpp
  58. +1 −1 src/analysis/vector/qgsoverlayanalyzer.cpp
  59. +2 −1 src/app/qgisapp.cpp
  60. +2 −0 src/app/qgisapp.h
  61. +62 −11 src/app/qgsattributetabledialog.cpp
  62. +11 −6 src/app/qgsattributetabledialog.h
  63. +1 −1 src/app/qgsdecorationgrid.cpp
  64. +207 −94 src/app/qgsmapstylingwidget.cpp
  65. +15 −13 src/app/qgsmapstylingwidget.h
  66. +32 −0 src/app/qgsrelationadddlg.cpp
  67. +2 −0 src/app/qgsrelationadddlg.h
  68. +5 −2 src/core/CMakeLists.txt
  69. +4 −1 src/core/composer/qgscomposerattributetable.h
  70. +50 −0 src/core/composer/qgscomposerattributetablev2.cpp
  71. +12 −2 src/core/composer/qgscomposerattributetablev2.h
  72. +4 −1 src/core/composer/qgscomposertable.h
  73. +4 −1 src/core/composer/qgscomposertexttable.h
  74. +1 −1 src/core/geometry/qgsabstractgeometryv2.h
  75. +2 −2 src/core/qgsapplication.cpp
  76. +170 −191 src/core/qgscoordinatereferencesystem.cpp
  77. +5 −30 src/core/qgscoordinatereferencesystem.h
  78. +124 −0 src/core/qgscoordinatereferencesystem_p.h
  79. +34 −0 src/core/qgsexpression.cpp
  80. +12 −0 src/core/qgsinterval.cpp
  81. +20 −4 src/core/qgsinterval.h
  82. +14 −16 src/core/qgsmaplayer.cpp
  83. +2 −1 src/core/qgsmaplayer.h
  84. +1 −0 src/core/qgsmaprenderer.h
  85. +2 −0 src/core/qgsofflineediting.cpp
  86. +8 −0 src/core/raster/qgsrasterrendererregistry.cpp
  87. +1 −0 src/core/raster/qgsrasterrendererregistry.h
  88. +1 −1 src/core/symbology-ng/qgs25drenderer.cpp
  89. +25 −66 src/core/symbology-ng/qgssymbolv2.cpp
  90. +4 −0 src/core/symbology-ng/qgssymbolv2.h
  91. +14 −0 src/gui/CMakeLists.txt
  92. +16 −5 src/gui/attributetable/qgsattributetablefiltermodel.cpp
  93. +2 −0 src/gui/attributetable/qgsattributetablefiltermodel.h
  94. +43 −33 src/gui/attributetable/qgsattributetablemodel.cpp
  95. +2 −0 src/gui/attributetable/qgsattributetableview.cpp
  96. +15 −2 src/gui/attributetable/qgsdualview.cpp
  97. +19 −0 src/gui/attributetable/qgsdualview.h
  98. +1 −0 src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
  99. +68 −0 src/gui/editorwidgets/core/qgssearchwidgetwrapper.cpp
  100. +86 −0 src/gui/editorwidgets/core/qgssearchwidgetwrapper.h
  101. +169 −0 src/gui/editorwidgets/qgscheckboxsearchwidgetwrapper.cpp
  102. +83 −0 src/gui/editorwidgets/qgscheckboxsearchwidgetwrapper.h
  103. +6 −1 src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp
  104. +1 −0 src/gui/editorwidgets/qgscheckboxwidgetfactory.h
  105. +5 −5 src/gui/editorwidgets/qgscolorwidgetwrapper.cpp
  106. +16 −4 src/gui/editorwidgets/qgsdatetimeedit.cpp
  107. +5 −0 src/gui/editorwidgets/qgsdatetimeedit.h
  108. +6 −0 src/gui/editorwidgets/qgsdatetimeeditfactory.cpp
  109. +1 −0 src/gui/editorwidgets/qgsdatetimeeditfactory.h
  110. +6 −0 src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp
  111. +1 −0 src/gui/editorwidgets/qgsdatetimeeditwrapper.h
  112. +173 −0 src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.cpp
  113. +81 −0 src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.h
  114. +198 −7 src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.cpp
  115. +22 −1 src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.h
  116. +1 −0 src/gui/editorwidgets/qgsphotowidgetwrapper.cpp
  117. +6 −0 src/gui/editorwidgets/qgsrelationreferencefactory.cpp
  118. +2 −0 src/gui/editorwidgets/qgsrelationreferencefactory.h
  119. +193 −0 src/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.cpp
  120. +86 −0 src/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.h
  121. +253 −0 src/gui/editorwidgets/qgssearchwidgettoolbutton.cpp
  122. +136 −0 src/gui/editorwidgets/qgssearchwidgettoolbutton.h
  123. +29 −0 src/gui/editorwidgets/qgstexteditsearchwidgetwrapper.cpp
  124. +50 −0 src/gui/editorwidgets/qgstexteditsearchwidgetwrapper.h
  125. +6 −0 src/gui/editorwidgets/qgstexteditwidgetfactory.cpp
  126. +1 −0 src/gui/editorwidgets/qgstexteditwidgetfactory.h
  127. +69 −0 src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp
  128. +8 −1 src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.h
  129. +91 −4 src/gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.cpp
  130. +11 −2 src/gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.h
  131. +1 −0 src/gui/qgsattributeeditor.h
  132. +208 −13 src/gui/qgsattributeform.cpp
  133. +40 −2 src/gui/qgsattributeform.h
  134. +163 −9 src/gui/qgsattributeformeditorwidget.cpp
  135. +73 −4 src/gui/qgsattributeformeditorwidget.h
  136. +32 −1 src/gui/qgscolorbuttonv2.cpp
  137. +32 −0 src/gui/qgscolorbuttonv2.h
  138. +12 −4 src/gui/qgsrelationeditorwidget.cpp
  139. +9 −0 src/gui/raster/qgsmultibandcolorrendererwidget.cpp
  140. +2 −0 src/gui/raster/qgspalettedrendererwidget.cpp
  141. +2 −1 src/gui/raster/qgsrasterhistogramwidget.cpp
  142. +7 −0 src/gui/raster/qgsrasterhistogramwidget.h
  143. +8 −0 src/gui/raster/qgsrasterrendererwidget.h
  144. +663 −0 src/gui/raster/qgsrastertransparencywidget.cpp
  145. +102 −0 src/gui/raster/qgsrastertransparencywidget.h
  146. +257 −0 src/gui/raster/qgsrendererrasterpropertieswidget.cpp
  147. +76 −0 src/gui/raster/qgsrendererrasterpropertieswidget.h
  148. +6 −0 src/gui/raster/qgssinglebandgrayrendererwidget.cpp
  149. +24 −0 src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
  150. +2 −0 src/gui/raster/qgssinglebandpseudocolorrendererwidget.h
  151. +10 −0 src/gui/symbology-ng/qgs25drendererwidget.cpp
  152. +1 −0 src/providers/memory/qgsmemoryprovider.cpp
  153. +1 −1 src/providers/postgres/qgspostgresprovider.cpp
  154. +1 −0 src/providers/wfs/qgswfsprovider.cpp
  155. +1 −1 src/python/qgspythonutilsimpl.cpp
  156. +2 −2 src/server/qgswcsprojectparser.cpp
  157. +1 −1 src/server/qgswmsprojectparser.cpp
  158. +2 −1 src/ui/CMakeLists.txt
  159. +29 −3 src/ui/qgsattributetabledialog.ui
  160. +97 −126 src/ui/qgscategorizedsymbolrendererv2widget.ui
  161. +209 −0 src/ui/qgsmapstylingwidgetbase.ui
  162. +72 −82 src/ui/qgsmultibandcolorrendererwidgetbase.ui
  163. +5 −2 src/ui/qgspalettedrendererwidgetbase.ui
  164. +89 −178 src/ui/qgsrasterhistogramwidgetbase.ui
  165. +5 −15 src/ui/qgsrasterminmaxwidgetbase.ui
  166. +4 −4 src/ui/qgsrelationadddlgbase.ui
  167. +398 −0 src/ui/qgsrendererrasterpropswidgetbase.ui
  168. +21 −22 src/ui/qgsrendererv2propsdialogbase.ui
  169. +25 −35 src/ui/qgssinglebandgrayrendererwidgetbase.ui
  170. +264 −348 src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui
  171. +401 −0 src/ui/raster/qgsrastertransparencywidget.ui
  172. +1 −0 tests/src/app/CMakeLists.txt
  173. +97 −0 tests/src/app/testqgisapppython.cpp
  174. +2 −0 tests/src/core/CMakeLists.txt
  175. +1 −0 tests/src/core/testqgs25drenderer.cpp
  176. +4 −4 tests/src/core/testqgscomposertablev2.cpp
  177. +18 −0 tests/src/core/testqgscoordinatereferencesystem.cpp
  178. +5 −0 tests/src/core/testqgsexpression.cpp
  179. +5 −0 tests/src/python/CMakeLists.txt
  180. +69 −23 tests/src/python/providertestbase.py
  181. +58 −0 tests/src/python/qgis_wrapped_server.py
  182. +97 −0 tests/src/python/test_qgsattributeformeditorwidget.py
  183. +43 −0 tests/src/python/test_qgscolorbuttonv2.py
  184. +164 −0 tests/src/python/test_qgssearchwidgettoolbutton.py
  185. +341 −0 tests/src/python/test_qgssearchwidgetwrapper.py
  186. +289 −0 tests/src/python/test_qgsserver_wfst.py
  187. +43 −44 tests/src/python/test_qgsvectorfilewriter.py
  188. BIN tests/testdata/wfs_transactional/test_linestring.dbf
  189. +1 −0 tests/testdata/wfs_transactional/test_linestring.prj
  190. +1 −0 tests/testdata/wfs_transactional/test_linestring.qpj
  191. BIN tests/testdata/wfs_transactional/test_linestring.shp
  192. BIN tests/testdata/wfs_transactional/test_linestring.shx
  193. BIN tests/testdata/wfs_transactional/test_point.dbf
  194. +1 −0 tests/testdata/wfs_transactional/test_point.prj
  195. +1 −0 tests/testdata/wfs_transactional/test_point.qpj
  196. BIN tests/testdata/wfs_transactional/test_point.shp
  197. BIN tests/testdata/wfs_transactional/test_point.shx
  198. BIN tests/testdata/wfs_transactional/test_polygon.dbf
  199. +1 −0 tests/testdata/wfs_transactional/test_polygon.prj
  200. +1 −0 tests/testdata/wfs_transactional/test_polygon.qpj
  201. BIN tests/testdata/wfs_transactional/test_polygon.shp
  202. BIN tests/testdata/wfs_transactional/test_polygon.shx
  203. +531 −0 tests/testdata/wfs_transactional/wfs_transactional.qgs
@@ -150,6 +150,11 @@ IF (MSVC AND CMAKE_GENERATOR MATCHES "NMake")
SET (USING_NMAKE TRUE)
ENDIF (MSVC AND CMAKE_GENERATOR MATCHES "NMake")

IF (CMAKE_GENERATOR MATCHES "Ninja")
# following variable is also used in qgsconfig.h
SET (USING_NINJA TRUE)
ENDIF (CMAKE_GENERATOR MATCHES "Ninja")

#############################################################
# check if lexer and parser are not missing
# http://www.mail-archive.com/cmake@cmake.org/msg02861.html
@@ -268,10 +273,12 @@ ELSE()
SET(QT_USE_QTNETWORK 1)
SET(QT_USE_QTSVG 1)
SET(QT_USE_QTSQL 1)
SET(QT_USE_QTWEBKIT 1)
IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR NOT QT_QTWEBKIT_FOUND OR (WITH_CUSTOM_WIDGETS AND NOT QT_QTDESIGNER_FOUND))
IF (WITH_QTWEBKIT)
SET(QT_USE_QTWEBKIT 1)
ENDIF(WITH_QTWEBKIT)
IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR (WITH_QTWEBKIT AND NOT QT_QTWEBKIT_FOUND) OR (WITH_CUSTOM_WIDGETS AND NOT QT_QTDESIGNER_FOUND))
MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")
ENDIF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR NOT QT_QTWEBKIT_FOUND OR (WITH_CUSTOM_WIDGETS AND NOT QT_QTDESIGNER_FOUND))
ENDIF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR (WITH_QTWEBKIT AND NOT QT_QTWEBKIT_FOUND) OR (WITH_CUSTOM_WIDGETS AND NOT QT_QTDESIGNER_FOUND))

INCLUDE( ${QT_USE_FILE} )

@@ -389,9 +396,9 @@ IF (PEDANTIC)
MESSAGE (STATUS "Pedantic compiler settings enabled")
IF(MSVC)
SET(_warnings "")
IF (NOT USING_NMAKE)
IF (NOT USING_NMAKE AND NOT USING_NINJA)
SET(_warnings "${_warnings} /W4" )
ENDIF (NOT USING_NMAKE)
ENDIF (NOT USING_NMAKE AND NOT USING_NINJA)

# disable warnings
SET(_warnings "${_warnings} /wd4100 ") # unused formal parameters
@@ -498,10 +505,10 @@ IF (WIN32)
ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNINGS)

IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
IF (NOT USING_NMAKE)
IF (NOT USING_NMAKE AND NOT USING_NINJA)
MESSAGE (STATUS "Generating browse files")
ADD_DEFINITIONS( /FR )
ENDIF (NOT USING_NMAKE)
ENDIF (NOT USING_NMAKE AND NOT USING_NINJA)
ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)

IF (INSTALL_DEPS)
@@ -746,10 +753,15 @@ IF (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
FIND_PROGRAM(GITCOMMAND git PATHS c:/cygwin/bin)
IF(GITCOMMAND)
IF(WIN32)
IF(USING_NINJA)
SET(ARG %a)
ELSE(USING_NINJA)
SET(ARG %%a)
ENDIF(USING_NINJA)
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc
COMMAND for /f \"usebackq tokens=1\" %%a in "(`\"${GITCOMMAND}\" log -n1 --oneline`)" do echo \#define QGSVERSION \"%%a\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp
COMMAND for /f \"usebackq tokens=1\" %%a in "(`\"${GITCOMMAND}\" log -n1 --oneline`)" do echo PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} \(%%a\)\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc
COMMAND for /f \"usebackq tokens=1\" ${ARG} in "(`\"${GITCOMMAND}\" log -n1 --oneline`)" do echo \#define QGSVERSION \"${ARG}\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp
COMMAND for /f \"usebackq tokens=1\" ${ARG} in "(`\"${GITCOMMAND}\" log -n1 --oneline`)" do echo PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} \(${ARG}\)\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc
COMMAND ${CMAKE_COMMAND} -DSRC=${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp -DDST=${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h -P ${CMAKE_SOURCE_DIR}/cmake/CopyIfChanged.cmake
MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/.git/index
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -1,9 +1,7 @@
export CTEST_PARALLEL_LEVEL=1
export PYTHONPATH=${HOME}/osgeo4travis/lib/python2.7/site-packages/
export PATH=${HOME}/osgeo4travis/bin:${HOME}/osgeo4travis/sbin:${PATH}
export LD_LIBRARY_PATH=${HOME}/osgeo4travis/lib

ccache -o max_size=150M
ccache -o run_second_cpp=true
export CTEST_PARALLEL_LEVEL=1
export CCACHE_CPP2=yes

xvfb-run ctest -V -E 'qgis_openstreetmaptest|qgis_wcsprovidertest' -S ./qgis-test-travis.ctest --output-on-failure
@@ -1,5 +1,3 @@
ProcessingGdalAlgorithmsTest
ProcessingQgisAlgorithmsTest
PyQgsComposerPicture
PyQgsGeometryTest
PyQgsJSONUtils
@@ -9,12 +7,9 @@ PyQgsPalLabelingServer
PyQgsRelationEditWidget
PyQgsServer
PyQgsServerAccessControl
PyQgsShapefileProvider
PyQgsSipCoverage
PyQgsSpatialiteProvider
PyQgsVirtualLayerDefinition
PyQgsVirtualLayerProvider
qgis_composermapgridtest
qgis_composertabletest
qgis_composertablev2test
qgis_composerutils
@@ -1,10 +1,9 @@
export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/
export PATH=${HOME}/osgeo4travis/bin:${HOME}/osgeo4travis/sbin:${PATH}
export LD_LIBRARY_PATH=${HOME}/osgeo4travis/lib
export CTEST_PARALLEL_LEVEL=1

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

# ccache -o max_size=150M
# ccache -o run_second_cpp=true

xvfb-run ctest -V -E "$(cat ${DIR}/blacklist.txt | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure
# xvfb-run ctest -V -S ./qgis-test-travis.ctest --output-on-failure
xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest|$(cat ${DIR}/blacklist.txt | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure
# xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest" -S ./qgis-test-travis.ctest --output-on-failure
@@ -32,8 +32,13 @@ ENDIF(NOT PYUIC_PROGRAM)
# Adapted from QT4_WRAP_UI
MACRO(PYQT_WRAP_UI outfiles )
IF(WIN32)
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.bat")
SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/bin/${CMAKE_BUILD_TYPE}")
IF(USING_NINJA OR USING_NMAKE)
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.bat")
SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/bin")
ELSE(USING_NINJA OR USING_NMAKE)
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.bat")
SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/bin/${CMAKE_BUILD_TYPE}")
ENDIF(USING_NINJA OR USING_NMAKE)
ELSE(WIN32)
# TODO osx
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
@@ -40,6 +40,8 @@

#cmakedefine USING_NMAKE

#cmakedefine USING_NINJA

#cmakedefine HAVE_POSTGRESQL

#cmakedefine HAVE_ORACLE
@@ -584,6 +584,10 @@
<file>themes/default/multieditSameValues.svg</file>
<file>themes/default/locked_repeating.svg</file>
<file>themes/default/sort.svg</file>
<file>themes/default/styleicons/multibandcolor.svg</file>
<file>themes/default/styleicons/paletted.svg</file>
<file>themes/default/styleicons/singlebandgray.svg</file>
<file>themes/default/styleicons/singlebandpseudocolor.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
@@ -0,0 +1,158 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
viewBox="0 0 16 16"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="rasterMultiband.svg">
<defs
id="defs4">
<linearGradient
id="linearGradient4253"
inkscape:collect="always">
<stop
id="stop4255"
offset="0"
style="stop-color:#000000;stop-opacity:1" />
<stop
id="stop4257"
offset="1"
style="stop-color:#0000ff;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient4247"
inkscape:collect="always">
<stop
id="stop4249"
offset="0"
style="stop-color:#001e00;stop-opacity:1" />
<stop
id="stop4251"
offset="1"
style="stop-color:#00ff00;stop-opacity:1" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4191">
<stop
style="stop-color:#1e0000;stop-opacity:1"
offset="0"
id="stop4193" />
<stop
style="stop-color:#ff0000;stop-opacity:1"
offset="1"
id="stop4195" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4191"
id="linearGradient4197"
x1="3"
y1="1039.3622"
x2="13"
y2="1039.3622"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.91739254,0,0,1.0343191,1.182132,-33.908714)" />
<linearGradient
gradientTransform="matrix(0.91739254,0,0,1.0343191,0.66085998,-31.16999)"
inkscape:collect="always"
xlink:href="#linearGradient4247"
id="linearGradient4197-9"
x1="3"
y1="1039.3622"
x2="13"
y2="1039.3622"
gradientUnits="userSpaceOnUse" />
<linearGradient
gradientTransform="matrix(0.91739254,0,0,1.3790921,0.66085998,-386.0143)"
inkscape:collect="always"
xlink:href="#linearGradient4253"
id="linearGradient4197-9-6"
x1="3"
y1="1039.3622"
x2="13"
y2="1039.3622"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.6"
inkscape:cx="-10.581282"
inkscape:cy="13.754625"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
units="px"
inkscape:window-width="1865"
inkscape:window-height="1056"
inkscape:window-x="55"
inkscape:window-y="24"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid4136" />
</sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1036.3622)">
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#5a5a5a;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4138-0-3-2"
width="11"
height="11"
x="2.5"
y="1038.8622" />
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4197);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.09954119;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4138"
width="10"
height="3"
x="3"
y="1039.3622" />
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4197-9);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.09954119;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4138-0"
width="10"
height="3"
x="3"
y="1042.3622" />
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4197-9-6);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.09954119;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4138-0-3"
width="10"
height="4"
x="3"
y="1045.3622" />
</g>
</svg>

0 comments on commit 92604cf

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