Commit 2451e91a authored by camilo higuita's avatar camilo higuita

fixes for latest mauikit

parent ddc79977
......@@ -26,6 +26,9 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/src/models
${CMAKE_CURRENT_BINARY_DIR}/src/models
${CMAKE_CURRENT_BINARY_DIR}/src/models/contacts
${CMAKE_CURRENT_BINARY_DIR}/src/models/contacts
)
set(dialer_SRCS
......@@ -64,10 +67,10 @@ if (ANDROID)
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
add_subdirectory(src/dialer/linux)
else()
find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config KIO Attica Contacts People )
find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config KIO Attica Contacts People SyntaxHighlighting)
find_package(Qt5 REQUIRED COMPONENTS WebEngine)
target_link_libraries(${PROJECT_NAME} KF5::ConfigCore KF5::Notifications KF5::KIOCore KF5::I18n KF5::Attica KF5::Contacts KF5::People )
target_link_libraries(${PROJECT_NAME} KF5::ConfigCore KF5::Notifications KF5::KIOCore KF5::I18n KF5::Attica KF5::Contacts KF5::People KF5::SyntaxHighlighting)
endif()
if (TARGET create-apk-dialer)
......
......@@ -59,11 +59,11 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.8284271"
inkscape:cx="-7.5332767"
inkscape:cy="116.59654"
inkscape:zoom="2"
inkscape:cx="-81.584118"
inkscape:cy="3.6231404"
inkscape:document-units="px"
inkscape:current-layer="g1240"
inkscape:current-layer="g1480"
showgrid="false"
units="px"
inkscape:showpageshadow="false"
......@@ -158,9 +158,25 @@
<g
id="g1380"
transform="translate(1.7945495,-3.8836458)">
<g
id="g1240">
<g
inkscape:export-xdpi="360"
inkscape:export-ydpi="360"
id="g1517">
<rect
ry="2.9999499"
y="1062.4031"
x="-1.7945495"
height="64"
width="64"
id="rect1482"
style="opacity:0.3;fill:none;fill-opacity:1;stroke:none;stroke-width:0.60000002;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<g
id="g1480">
<g
style="opacity:0.2;fill:#000000;filter:url(#filter1358)"
transform="translate(0.09375,1.593737)"
transform="translate(0.09375,1.5937458)"
id="g1240-2">
<g
style="fill:#000000;fill-opacity:1"
......@@ -174,17 +190,15 @@
id="rect4140-6-4" />
</g>
</g>
<g
id="g1240">
<rect
transform="matrix(1.1412551,0,0,0.92328548,-9.8322279,85.72997)"
ry="1.9852"
y="1067.5197"
x="35"
height="46"
width="19"
id="rect920"
style="opacity:1;fill:#37474f;fill-opacity:1;stroke:#263238;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
style="opacity:1;fill:#37474f;fill-opacity:1;stroke:#263238;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
transform="matrix(1.1412551,0,0,0.92328548,-9.8322279,85.72997)" />
<path
transform="matrix(1.1412551,0,0,0.92328548,-9.8322279,85.72997)"
sodipodi:nodetypes="ssccsss"
......@@ -209,7 +223,7 @@
height="11.434857"
width="11.722495"
id="rect940"
style="opacity:1;fill:#81d4fa;fill-opacity:1;stroke:none;stroke-width:1.03484964;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
style="opacity:1;fill:#1a237e;fill-opacity:1;stroke:none;stroke-width:1.03484964;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
transform="matrix(1.1412551,0,0,0.92328548,-9.8322279,85.72997)"
sodipodi:nodetypes="ssccsss"
......@@ -298,6 +312,8 @@
</g>
</g>
</g>
</g>
</g>
<g
id="g1320"
transform="translate(-0.1767767)" />
......
......@@ -14,8 +14,8 @@
#endif
#include "src/union.h"
#include "contactsmodel.h"
#include "calllogs.h"
#include "src/models/contacts/contactsmodel.h"
#include "src/models/contacts/calllogs.h"
#include "contactimage.h"
#ifdef STATIC_KIRIGAMI
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment