Commit 80a8d54e authored by Wolthera van Hövell's avatar Wolthera van Hövell 🛍

Merge branch 'master' into krita-testing-wolthera

parents 389c2bd5 da04c19d
......@@ -152,7 +152,7 @@ On Windows
Depending on what you want to use, run this command for MSBuild:
cmake ..\krita -G "Visual Studio 14 Win64" -DBoost_DEBUG=OFF -DBOOST_INCLUDEDIR=c:\dev\i\include -DBOOST_DEBUG=ON -DBOOST_ROOT=c:\dev\i -DBOOST_LIBRARYDIR=c:\dev\i\lib -DCMAKE_INSTALL_PREFIX=c:\dev\i -DCMAKE_PREFIX_PATH=c:\dev\i -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DHAVE_MEMORY_LEAK_TRACKER=OFF -DPACKAGERS_BUILD=ON -Wno-dev -DDEFINE_NO_DEPRECATED=1
cmake ..\krita -G "NMake Makefiles" -DBoost_DEBUG=OFF -DBOOST_INCLUDEDIR=c:\dev\i\include -DBOOST_DEBUG=ON -DBOOST_ROOT=c:\dev\i -DBOOST_LIBRARYDIR=c:\dev\i\lib -DCMAKE_INSTALL_PREFIX=c:\dev\i -DCMAKE_PREFIX_PATH=c:\dev\i -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DHAVE_MEMORY_LEAK_TRACKER=OFF -DPACKAGERS_BUILD=ON -Wno-dev -DDEFINE_NO_DEPRECATED=1
Or this to use jom (faster compiling, uses all cores, ships with QtCreator/pre-built Qt binaries):
......
SET(PREFIX_ext_gettext "${EXTPREFIX}" )
if (MSVC OR MINGW)
ExternalProject_Add(
ext_gettext
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/gettext-0.18.tar.gz
URL_MD5 d52a3e061032a1ed13856d42fc86f0fd
if(CMAKE_CL_64)
ext_gettext
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/gettext0.19.8.1-iconv1.14-shared-32.zip
URL_MD5 f877ebff42736535415b4ddb9c631b86
CONFIGURE_COMMAND ""
BUILD_COMMAND ${CMAKE_COMMAND} -E echo deploying gettext.exe binary
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/bin ${PREFIX_ext_gettext}/bin
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/lib ${PREFIX_ext_gettext}/lib
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include ${PREFIX_ext_gettext}/include
PATCH_COMMAND ${PATCH_COMMAND} --binary -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/gettext-0.18-20130319.diff
INSTALL_DIR ${PREFIX_ext_gettext}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_gettext} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_patch ext_iconv
else()
ext_gettext
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/gettext0.19.8.1-iconv1.14-shared-64.zip
URL_MD5 bced59a375aef8d325b746f0dfbe8f48
CONFIGURE_COMMAND ""
BUILD_COMMAND ${CMAKE_COMMAND} -E echo deploying gettext.exe binary
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/bin ${PREFIX_ext_gettext}/bin
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/lib ${PREFIX_ext_gettext}/lib
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include ${PREFIX_ext_gettext}/include
UPDATE_COMMAND ""
ALWAYS 0
endif()
)
else (MSVC OR MINGW)
ExternalProject_Add( ext_gettext
......
This diff is collapsed.
......@@ -318,6 +318,8 @@ add_definitions(
-DQT_DISABLE_DEPRECATED_BEFORE=0
)
add_definitions(-DTRANSLATION_DOMAIN=\"krita\")
#
# The reason for this mode is that the Debug mode disable inlining
#
......@@ -656,11 +658,6 @@ add_subdirectory(plugins)
add_subdirectory( benchmarks )
add_definitions(-DTRANSLATION_DOMAIN=\"krita\")
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
ki18n_install(po)
endif()
macro_display_feature_log()
......
This diff is collapsed.
dark_applications-system.svg
\ No newline at end of file
<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="22"
height="22"
id="svg3613"
version="1.1"
inkscape:version="0.48+devel r"
sodipodi:docname="applications-system.svg">
<defs
id="defs3615" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="8"
inkscape:cx="0.13827514"
inkscape:cy="-4.0441868"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1366"
inkscape:window-height="669"
inkscape:window-x="-4"
inkscape:window-y="25"
inkscape:window-maximized="1"
inkscape:showpageshadow="false"
borderlayer="true">
<sodipodi:guide
position="2,20.000017"
orientation="18,0"
id="guide4074" />
<sodipodi:guide
position="2,2.0000174"
orientation="0,18"
id="guide4076" />
<sodipodi:guide
position="20,2.0000174"
orientation="-18,0"
id="guide4078" />
<sodipodi:guide
position="20,20.000017"
orientation="0,-18"
id="guide4080" />
<sodipodi:guide
position="3,19.000017"
orientation="16,0"
id="guide4082" />
<sodipodi:guide
position="3,3.0000174"
orientation="0,16"
id="guide4084" />
<sodipodi:guide
position="19,3.0000174"
orientation="-16,0"
id="guide4086" />
<sodipodi:guide
position="19,19.000017"
orientation="0,-16"
id="guide4088" />
<inkscape:grid
type="xygrid"
id="grid4090" />
</sodipodi:namedview>
<metadata
id="metadata3618">
<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="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1030.3622)">
<rect
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
id="rect4139"
width="5.0000019"
height="5.0000019"
x="9.000001"
y="1033.3622"
ry="2.500001" />
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
d="M 5.5 14 C 4.1149999 14 3 15.115 3 16.5 C 3 17.885 4.1149999 19 5.5 19 C 6.8850001 19 8 17.885 8 16.5 C 8 15.115 6.8850001 14 5.5 14 z M 5.5 15 C 6.3310001 15 7 15.669 7 16.5 C 7 17.331 6.3310001 18 5.5 18 C 4.6689999 18 4 17.331 4 16.5 C 4 15.669 4.6689999 15 5.5 15 z "
id="rect4141"
transform="translate(0,1030.3622)" />
<rect
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
id="rect4200"
width="16"
height="0.9999826"
x="3"
y="1035.3622"
ry="0" />
<rect
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
id="rect4206"
width="12"
height="0.9999826"
x="7"
y="1046.3622" />
</g>
</svg>
dark_configure.svg
\ No newline at end of file
<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
id="svg3049"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="document-properties.svg"
inkscape:export-filename="/home/uri/.kde/share/icons/NITRUX-KDE/16x16/actions/view-right-new.png"
inkscape:export-xdpi="30"
inkscape:export-ydpi="30">
<defs
id="defs3051" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="34.5228"
inkscape:cx="-2.8375081"
inkscape:cy="8.7941485"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1920"
inkscape:window-height="1021"
inkscape:window-x="-4"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:showpageshadow="false"
borderlayer="true"
inkscape:object-nodes="true">
<inkscape:grid
type="xygrid"
id="grid4085" />
<sodipodi:guide
position="2.0000044,14.00003"
orientation="12,0"
id="guide4075" />
<sodipodi:guide
position="2.0000044,2.0000296"
orientation="0,12"
id="guide4077" />
<sodipodi:guide
position="14.000004,2.0000296"
orientation="-12,0"
id="guide4079" />
<sodipodi:guide
position="14.000004,14.00003"
orientation="0,-12"
id="guide4081" />
</sodipodi:namedview>
<metadata
id="metadata3054">
<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="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-421.71429,-531.79074)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
d="m 2,2 0,3 0,9 1,0 11,0 0,-1 L 14,2 3,2 Z m 1,3 10,0 0,8 -10,0 z m 1,1 0,6 2,0 0,-6 z m 3,1 0,1 5,0 0,-1 z m 0,3 0,1 5,0 0,-1 z"
transform="translate(421.71429,531.79074)"
id="rect4083"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccccccccccccccccccccc" />
</g>
</svg>
dark_window-close.svg
\ No newline at end of file
<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="22"
height="22"
id="svg2"
version="1.1"
inkscape:version="0.49 r12742"
viewBox="0 0 22.000001 22"
sodipodi:docname="window-close.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="17.741952"
inkscape:cx="4.1230246"
inkscape:cy="14.057948"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
units="px"
inkscape:showpageshadow="false"
borderlayer="true"
inkscape:window-width="1366"
inkscape:window-height="718"
inkscape:window-x="-2"
inkscape:window-y="23"
inkscape:window-maximized="1">
<sodipodi:guide
position="2.0000004,20.000017"
orientation="17.999999,0"
id="guide4066" />
<sodipodi:guide
position="2.0000004,2.0000178"
orientation="0,17.999999"
id="guide4068" />
<sodipodi:guide
position="19.999999,2.0000178"
orientation="-17.999999,0"
id="guide4070" />
<sodipodi:guide
position="19.999999,20.000017"
orientation="0,-17.999999"
id="guide4072" />
<sodipodi:guide
position="3.0000003,19.000017"
orientation="15.999999,0"
id="guide4074" />
<sodipodi:guide
position="3.0000003,3.0000177"
orientation="0,15.999999"
id="guide4076" />
<sodipodi:guide
position="18.999999,3.0000177"
orientation="-15.999999,0"
id="guide4078" />
<sodipodi:guide
position="18.999999,19.000017"
orientation="0,-15.999999"
id="guide4080" />
<inkscape:grid
type="xygrid"
id="grid4101" />
</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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1030.3622)">
<rect
style="fill:#da4453;fill-opacity:1;stroke:none"
id="rect4103"
width="21.628"
height="0.9999823"
x="733.31848"
y="728.07611"
transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
<rect
transform="matrix(0.70710678,-0.70710678,-0.70710678,-0.70710678,0,0)"
y="-744.63245"
x="-739.39008"
height="0.9999823"
width="21.628"
id="rect4105"
style="fill:#da4453;fill-opacity:1;stroke:none" />
</g>
</svg>
dark_configure.svg
\ No newline at end of file
<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
id="svg3049"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="document-properties.svg"
inkscape:export-filename="/home/uri/.kde/share/icons/NITRUX-KDE/16x16/actions/view-right-new.png"
inkscape:export-xdpi="30"
inkscape:export-ydpi="30">
<defs
id="defs3051" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="34.5228"
inkscape:cx="-2.8375081"
inkscape:cy="8.7941485"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1920"
inkscape:window-height="1021"
inkscape:window-x="-4"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:showpageshadow="false"
borderlayer="true"
inkscape:object-nodes="true">
<inkscape:grid
type="xygrid"
id="grid4085" />
<sodipodi:guide
position="2.0000044,14.00003"
orientation="12,0"
id="guide4075" />
<sodipodi:guide
position="2.0000044,2.0000296"
orientation="0,12"
id="guide4077" />
<sodipodi:guide
position="14.000004,2.0000296"
orientation="-12,0"
id="guide4079" />
<sodipodi:guide
position="14.000004,14.00003"
orientation="0,-12"
id="guide4081" />
</sodipodi:namedview>
<metadata
id="metadata3054">
<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="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-421.71429,-531.79074)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
d="m 2,2 0,3 0,9 1,0 11,0 0,-1 L 14,2 3,2 Z m 1,3 10,0 0,8 -10,0 z m 1,1 0,6 2,0 0,-6 z m 3,1 0,1 5,0 0,-1 z m 0,3 0,1 5,0 0,-1 z"
transform="translate(421.71429,531.79074)"
id="rect4083"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccccccccccccccccccccc" />
</g>
</svg>
dark_arrow-right.svg
\ No newline at end of file
<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="22"
height="22"
id="svg2"
version="1.1"
inkscape:version="0.48+devel r"
viewBox="0 0 21.999999 22"
sodipodi:docname="arrow-right.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="32"
inkscape:cx="3.7327951"
inkscape:cy="11.666016"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1366"
inkscape:window-height="718"
inkscape:window-x="-2"
inkscape:window-y="23"
inkscape:window-maximized="1"
inkscape:showpageshadow="false"
borderlayer="true"
units="px"
width="24px"
showguides="true">
<inkscape:grid
type="xygrid"
id="grid4081" />
<sodipodi:guide
position="2,20.000017"
orientation="18,0"
id="guide4113" />
<sodipodi:guide
position="2,2.0000174"
orientation="0,18"
id="guide4115" />
<sodipodi:guide
position="20,2.0000174"
orientation="-18,0"
id="guide4117" />
<sodipodi:guide
position="20,20.000017"
orientation="0,-18"
id="guide4119" />
<sodipodi:guide
position="2,20.000017"
orientation="18,0"
id="guide4143" />
<sodipodi:guide
position="2,2.0000174"
orientation="0,3.9999995"
id="guide4145" />
<sodipodi:guide
position="5.9999995,20.000017"
orientation="0,-3.9999995"
id="guide4149" />
<sodipodi:guide
position="15.999999,2.0000174"
orientation="0,4.0000019"
id="guide4153" />
<sodipodi:guide
position="20,2.0000174"
orientation="-18,0"
id="guide4155" />
<sodipodi:guide
position="20,20.000017"
orientation="0,-4.0000019"
id="guide4157" />
<sodipodi:guide
position="3,19.000017"
orientation="16,0"
id="guide4278" />
<sodipodi:guide
position="3,3.0000174"
orientation="0,16"
id="guide4280" />
<sodipodi:guide
position="19,3.0000174"
orientation="-16,0"
id="guide4282" />
<sodipodi:guide
position="19,19.000017"
orientation="0,-16"
id="guide4284" />
<sodipodi:guide
position="3,4.0000174"
orientation="1,0"
id="guide4290" />
<sodipodi:guide
position="3,3.0000174"
orientation="0,16"
id="guide4292" />
<sodipodi:guide
position="19,3.0000174"
orientation="-1,0"
id="guide4294" />
<sodipodi:guide
position="3,19.000262"
orientation="1,0"
id="guide4298" />
<sodipodi:guide
position="19,18.000262"
orientation="-1,0"
id="guide4302" />
<sodipodi:guide
position="19,19.000262"
orientation="0,-16"
id="guide4304" />
<sodipodi:guide
position="3,19.000017"
orientation="16,0"
id="guide4132" />
<sodipodi:guide
position="3,3.0000174"
orientation="0,4.0000005"
id="guide4134" />
<sodipodi:guide
position="7.0000005,3.0000174"
orientation="-16,0"
id="guide4136" />
<sodipodi:guide
position="7.0000005,19.000017"
orientation="0,-4.0000005"
id="guide4138" />
<sodipodi:guide
position="15.000001,19.000017"
orientation="16,0"
id="guide4140" />
<sodipodi:guide
position="15.000001,3.0000174"
orientation="0,4"
id="guide4142" />
<sodipodi:guide
position="19,3.0000174"
orientation="-16,0"
id="guide4144" />
<sodipodi:guide
position="19,19.000017"
orientation="0,-4"
id="guide4146" />
<sodipodi:guide
position="7.0000005,11.000506"
orientation="8,0"
id="guide4158" />
<sodipodi:guide
position="7.0000005,3.0005057"
orientation="0,8"
id="guide4160" />
<sodipodi:guide
position="15.000001,3.0005057"
orientation="-8,0"
id="guide4162" />
<sodipodi:guide
position="15.000001,11.000506"
orientation="0,-8"
id="guide4164" />
<sodipodi:guide
position="7.0000005,19.000017"
orientation="15.999512,0"
id="guide4168" />
<sodipodi:guide
position="7.0000005,3.0005057"
orientation="0,0.99999952"
id="guide4170" />
<sodipodi:guide
position="8,19.000017"
orientation="0,-0.99999952"