From 791f000c884881bb44a286804573d4c6beca0eb1 Mon Sep 17 00:00:00 2001
From: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
Date: Mon, 28 Sep 2015 12:58:47 -0400
Subject: [PATCH] contact: fix image to contact
- Jpeg were not loaded because a dll was missing
- Also fix default image for empty url
Issue: #80570
Change-Id: I7996fe4034466bc97e8a902485038bbb824892e9
---
RingWinClient.pro | 4 ++--
windowscontactbackend.cpp | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/RingWinClient.pro b/RingWinClient.pro
index 2cef1a5..031ce9d 100644
--- a/RingWinClient.pro
+++ b/RingWinClient.pro
@@ -161,12 +161,12 @@ win32 {
$$RUNTIMEDIR/Qt5Xml.dll $$RUNTIMEDIR/Qt5WinExtras.dll
QTRUNTIME.path = $$OUT_PWD/release
- QTDEPSRUNTIME.files = $$RUNTIMEDIR/zlib1.dll $$RUNTIMEDIR/iconv.dll \
+ QTDEPSRUNTIME.files = $$RUNTIMEDIR/zlib1.dll \
$$RUNTIMEDIR/libfreetype-6.dll $$RUNTIMEDIR/libglib-2.0-0.dll \
$$RUNTIMEDIR/libharfbuzz-0.dll \
$$RUNTIMEDIR/libintl-8.dll $$RUNTIMEDIR/libpcre-1.dll \
$$RUNTIMEDIR/libpcre16-0.dll $$RUNTIMEDIR/libpng16-16.dll \
- $$RUNTIMEDIR/libjpeg-62.dll $$RUNTIMEDIR/libiconv-2.dll
+ $$RUNTIMEDIR/libjpeg-8.dll $$RUNTIMEDIR/libiconv-2.dll
QTDEPSRUNTIME.path = $$OUT_PWD/release
QTPLATFORMS.files = $$(QTDIR)/plugins/platforms/qwindows.dll
diff --git a/windowscontactbackend.cpp b/windowscontactbackend.cpp
index da876b2..69f9faf 100644
--- a/windowscontactbackend.cpp
+++ b/windowscontactbackend.cpp
@@ -288,8 +288,9 @@ WindowsContactBackend::getPersonFromContactFile(const QDir& contactDir,
QString photoValue = reader.readElementText();
QImage photo;
photo.load(photoValue);
- p->setPhoto(photo.scaled(sizePhoto_,sizePhoto_, Qt::KeepAspectRatio,
- Qt::SmoothTransformation));
+ if (not photo.isNull())
+ p->setPhoto(photo.scaled(sizePhoto_,sizePhoto_, Qt::KeepAspectRatio,
+ Qt::SmoothTransformation));
}
}
else if (name == "EmailAddress") {
--
GitLab