diff --git a/src/akonadi-contacts/contactviewer.cpp b/src/akonadi-contacts/contactviewer.cpp
index 98120dc4..45743d6e 100644
--- a/src/akonadi-contacts/contactviewer.cpp
+++ b/src/akonadi-contacts/contactviewer.cpp
@@ -1,372 +1,376 @@
 /*
     This file is part of Akonadi Contact.
 
     Copyright (c) 2009 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This library is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 #include "contactviewer.h"
 
 #include "contactmetadataakonadi_p.h"
 #include "attributes/contactmetadataattribute_p.h"
 #include "customfieldmanager_p.h"
 #include "standardcontactformatter.h"
 #include "textbrowser_p.h"
 
 #include "editor/im/improtocols.h"
 #include <KIOCore/kio/transferjob.h>
 #include <collection.h>
 #include <collectionfetchjob.h>
 #include <entitydisplayattribute.h>
 #include <item.h>
 #include <itemfetchscope.h>
 #include <kcontacts/addressee.h>
 #include <kcolorscheme.h>
 #include <kconfiggroup.h>
 #include <KLocalizedString>
 #include <kstringhandler.h>
 
 #include <QVBoxLayout>
 #include <QIcon>
 #include <QUrlQuery>
 #include <prison/Prison>
 #include <kcontacts/vcardconverter.h>
 
 using namespace Akonadi;
 
 class Q_DECL_HIDDEN ContactViewer::Private
 {
 public:
     Private(ContactViewer *parent)
         : mParent(parent)
         , mBrowser(nullptr)
         , mParentCollectionFetchJob(nullptr)
     {
         mStandardContactFormatter = new StandardContactFormatter;
         mContactFormatter = mStandardContactFormatter;
         KConfig config(QStringLiteral("akonadi_contactrc"));
         KConfigGroup group(&config, QStringLiteral("View"));
         mShowQRCode = group.readEntry("QRCodes", true);
         mQRCode = Prison::createBarcode(Prison::QRCode);
         mDataMatrix = Prison::createBarcode(Prison::DataMatrix);
     }
 
     ~Private()
     {
         delete mStandardContactFormatter;
         delete mQRCode;
         delete mDataMatrix;
     }
 
     void updateView(const QVariantList &localCustomFieldDescriptions = QVariantList(), const QString &addressBookName = QString())
     {
         static QPixmap defaultPixmap = QIcon::fromTheme(QStringLiteral("user-identity")).pixmap(QSize(100, 100));
         static QPixmap defaultMapPixmap = QIcon::fromTheme(QStringLiteral("document-open-remote")).pixmap(QSize(16, 16));
         static QPixmap defaultSmsPixmap = QIcon::fromTheme(IMProtocols::self()->icon(QStringLiteral("messaging/sms"))).pixmap(QSize(16, 16));
 
         mParent->setWindowTitle(i18n("Contact %1", mCurrentContact.assembledName()));
 
         if (mCurrentContact.photo().isIntern()) {
             mBrowser->document()->addResource(QTextDocument::ImageResource,
                                               QUrl(QStringLiteral("contact_photo")),
                                               mCurrentContact.photo().data());
         } else if (!mCurrentContact.photo().url().isEmpty()) {
             QByteArray imageData;
             QImage image;
             KIO::TransferJob *job = KIO::get(QUrl(mCurrentContact.photo().url()), KIO::NoReload);
             QObject::connect(job, &KIO::TransferJob::data,
                              [&imageData](KIO::Job *, const QByteArray &data) {
                 imageData.append(data);
             });
             if (job->exec()) {
                 if (image.loadFromData(imageData)) {
                     mBrowser->document()->addResource(QTextDocument::ImageResource,
                                                       QUrl(QStringLiteral("contact_photo")),
                                                       image);
                 } else {
                     mBrowser->document()->addResource(QTextDocument::ImageResource,
                                                       QUrl(QStringLiteral("contact_photo")),
                                                       defaultPixmap);
                 }
             } else {
                 mBrowser->document()->addResource(QTextDocument::ImageResource,
                                                   QUrl(QStringLiteral("contact_photo")),
                                                   defaultPixmap);
             }
         } else {
             mBrowser->document()->addResource(QTextDocument::ImageResource,
                                               QUrl(QStringLiteral("contact_photo")),
                                               defaultPixmap);
         }
 
         if (mCurrentContact.logo().isIntern()) {
             mBrowser->document()->addResource(QTextDocument::ImageResource,
                                               QUrl(QStringLiteral("contact_logo")),
                                               mCurrentContact.logo().data());
         } else if (!mCurrentContact.logo().url().isEmpty()) {
             QByteArray imageData;
             QImage image;
             KIO::TransferJob *job = KIO::get(QUrl(mCurrentContact.logo().url()), KIO::NoReload);
             QObject::connect(job, &KIO::TransferJob::data,
                              [&imageData](KIO::Job *, const QByteArray &data) {
                 imageData.append(data);
             });
             if (job->exec()) {
                 if (image.loadFromData(imageData)) {
                     mBrowser->document()->addResource(QTextDocument::ImageResource,
                                                       QUrl(QStringLiteral("contact_logo")),
                                                       image);
                 }
             }
         }
 
         mBrowser->document()->addResource(QTextDocument::ImageResource,
                                           QUrl(QStringLiteral("map_icon")),
                                           defaultMapPixmap);
 
         mBrowser->document()->addResource(QTextDocument::ImageResource,
                                           QUrl(QStringLiteral("sms_icon")),
                                           defaultSmsPixmap);
 
         if (mShowQRCode) {
             KContacts::VCardConverter converter;
             KContacts::Addressee addr(mCurrentContact);
             addr.setPhoto(KContacts::Picture());
             addr.setLogo(KContacts::Picture());
             const QString data = QString::fromUtf8(converter.createVCard(addr));
-            mQRCode->setData(data);
-            mDataMatrix->setData(data);
-            mBrowser->document()->addResource(QTextDocument::ImageResource,
-                                              QUrl(QStringLiteral("qrcode")),
-                                              mQRCode->toImage(QSizeF(50, 50)));
-            mBrowser->document()->addResource(QTextDocument::ImageResource,
-                                              QUrl(QStringLiteral("datamatrix")),
-                                              mDataMatrix->toImage(QSizeF(50, 50)));
+	    if (mQRCode) {
+                mQRCode->setData(data);
+                mBrowser->document()->addResource(QTextDocument::ImageResource,
+                                                  QUrl(QStringLiteral("qrcode")),
+                                                  mQRCode->toImage(QSizeF(50, 50)));
+            }
+	    if (mDataMatrix) {
+                mDataMatrix->setData(data);
+                mBrowser->document()->addResource(QTextDocument::ImageResource,
+                                                  QUrl(QStringLiteral("datamatrix")),
+                                                  mDataMatrix->toImage(QSizeF(50, 50)));
+            }
         }
 
         // merge local and global custom field descriptions
         QVector<QVariantMap> customFieldDescriptions;
         const CustomField::List globalCustomFields = CustomFieldManager::globalCustomFieldDescriptions();
         customFieldDescriptions.reserve(localCustomFieldDescriptions.count() + globalCustomFields.count());
         for (const QVariant &entry : qAsConst(localCustomFieldDescriptions)) {
             customFieldDescriptions << entry.toMap();
         }
 
         for (const CustomField &field : qAsConst(globalCustomFields)) {
             QVariantMap description;
             description.insert(QStringLiteral("key"), field.key());
             description.insert(QStringLiteral("title"), field.title());
 
             customFieldDescriptions << description;
         }
 
         KContacts::Addressee contact(mCurrentContact);
         if (!addressBookName.isEmpty()) {
             contact.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("AddressBook"), addressBookName);
         }
 
         mContactFormatter->setContact(contact);
         mContactFormatter->setCustomFieldDescriptions(customFieldDescriptions);
 
         mBrowser->setHtml(mContactFormatter->toHtml());
     }
 
     void slotMailClicked(const QString &, const QString &email)
     {
         QString name, address;
 
         // remove the 'mailto:' and split into name and email address
         KContacts::Addressee::parseEmailAddress(email.mid(7), name, address);
 
         Q_EMIT mParent->emailClicked(name, address);
     }
 
     void slotUrlClicked(const QUrl &url)
     {
         const QUrlQuery query(url);
         const QString urlScheme(url.scheme());
         if (urlScheme == QLatin1String("http")
             || urlScheme == QLatin1String("https")) {
             Q_EMIT mParent->urlClicked(url);
         } else if (urlScheme == QLatin1String("phone")) {
             const int pos = query.queryItemValue(QStringLiteral("index")).toInt();
 
             const KContacts::PhoneNumber::List numbers = mCurrentContact.phoneNumbers();
             if (pos < numbers.count()) {
                 Q_EMIT mParent->phoneNumberClicked(numbers.at(pos));
             }
         } else if (urlScheme == QLatin1String("sms")) {
             const int pos = query.queryItemValue(QStringLiteral("index")).toInt();
 
             const KContacts::PhoneNumber::List numbers = mCurrentContact.phoneNumbers();
             if (pos < numbers.count()) {
                 Q_EMIT mParent->smsClicked(numbers.at(pos));
             }
         } else if (urlScheme == QLatin1String("address")) {
             const int pos = query.queryItemValue(QStringLiteral("index")).toInt();
 
             const KContacts::Address::List addresses = mCurrentContact.addresses();
             if (pos < addresses.count()) {
                 Q_EMIT mParent->addressClicked(addresses.at(pos));
             }
         } else if (urlScheme == QLatin1String("mailto")) {
             QString name, address;
 
             // remove the 'mailto:' and split into name and email address
             KContacts::Addressee::parseEmailAddress(url.path(), name, address);
 
             Q_EMIT mParent->emailClicked(name, address);
         }
     }
 
     void slotParentCollectionFetched(KJob *job)
     {
         mParentCollectionFetchJob = nullptr;
 
         QString addressBookName;
 
         if (!job->error()) {
             CollectionFetchJob *fetchJob = qobject_cast<CollectionFetchJob *>(job);
             if (!fetchJob->collections().isEmpty()) {
                 const Collection collection = fetchJob->collections().at(0);
                 addressBookName = collection.displayName();
             }
         }
 
         // load the local meta data of the item
         ContactMetaDataAkonadi metaData;
         metaData.load(mCurrentItem);
 
         updateView(metaData.customFieldDescriptions(), addressBookName);
     }
 
     ContactViewer *mParent = nullptr;
     TextBrowser *mBrowser = nullptr;
     KContacts::Addressee mCurrentContact;
     Item mCurrentItem;
     AbstractContactFormatter *mContactFormatter = nullptr;
     AbstractContactFormatter *mStandardContactFormatter = nullptr;
     CollectionFetchJob *mParentCollectionFetchJob = nullptr;
     bool mShowQRCode;
     Prison::AbstractBarcode *mQRCode = nullptr;
     Prison::AbstractBarcode *mDataMatrix = nullptr;
 };
 
 ContactViewer::ContactViewer(QWidget *parent)
     : QWidget(parent)
     , d(new Private(this))
 {
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->setMargin(0);
 
     d->mBrowser = new TextBrowser;
 
     connect(d->mBrowser, &TextBrowser::anchorClicked,
             this, [this](const QUrl &url) {
         d->slotUrlClicked(url);
     });
 
     layout->addWidget(d->mBrowser);
 
     // always fetch full payload for contacts
     fetchScope().fetchFullPayload();
     fetchScope().fetchAttribute<ContactMetaDataAttribute>();
     fetchScope().setAncestorRetrieval(ItemFetchScope::Parent);
 }
 
 ContactViewer::~ContactViewer()
 {
     delete d;
 }
 
 Akonadi::Item ContactViewer::contact() const
 {
     return ItemMonitor::item();
 }
 
 KContacts::Addressee ContactViewer::rawContact() const
 {
     return d->mCurrentContact;
 }
 
 void ContactViewer::setContactFormatter(AbstractContactFormatter *formatter)
 {
     if (formatter == nullptr) {
         d->mContactFormatter = d->mStandardContactFormatter;
     } else {
         d->mContactFormatter = formatter;
         delete d->mStandardContactFormatter;
         d->mStandardContactFormatter = nullptr;
     }
 }
 
 void ContactViewer::setContact(const Akonadi::Item &contact)
 {
     ItemMonitor::setItem(contact);
 }
 
 void ContactViewer::setRawContact(const KContacts::Addressee &contact)
 {
     d->mCurrentContact = contact;
 
     d->updateView();
 }
 
 void ContactViewer::itemChanged(const Item &contactItem)
 {
     if (!contactItem.hasPayload<KContacts::Addressee>()) {
         return;
     }
 
     d->mCurrentItem = contactItem;
     d->mCurrentContact = contactItem.payload<KContacts::Addressee>();
 
     // stop any running fetch job
     if (d->mParentCollectionFetchJob) {
         disconnect(d->mParentCollectionFetchJob, SIGNAL(result(KJob*)), this, SLOT(slotParentCollectionFetched(KJob*)));
         delete d->mParentCollectionFetchJob;
         d->mParentCollectionFetchJob = nullptr;
     }
 
     d->mParentCollectionFetchJob = new CollectionFetchJob(contactItem.parentCollection(), CollectionFetchJob::Base, this);
     connect(d->mParentCollectionFetchJob, SIGNAL(result(KJob*)), SLOT(slotParentCollectionFetched(KJob*)));
 }
 
 void ContactViewer::itemRemoved()
 {
     d->mBrowser->clear();
 }
 
 void ContactViewer::updateView()
 {
     itemChanged(d->mCurrentItem);
 }
 
 void ContactViewer::setShowQRCode(bool b)
 {
     if (d->mShowQRCode != b) {
         d->mShowQRCode = b;
         updateView();
     }
 }
 
 bool ContactViewer::showQRCode() const
 {
     return d->mShowQRCode;
 }
 
 #include "moc_contactviewer.cpp"