diff --git a/RingWinClient.pro b/RingWinClient.pro index 2cef1a59612f0b9662acb9b7e1cc9891f32609b9..031ce9db2990a5f1668dbb3ffaec4089e03315e5 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 da876b28175396458d54d5ce66389547bb8efa5b..69f9faff2f1b9b092f9cde3b2d012790f6337aff 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") {