I'm moving this to the done board as I see products in each category.

There were conflicts when I tried to merge the 3.3 branch into master, I think I better leave that to you... ;-)

Go for it. Thanks for your diligence fixing up my mistakes!

Use connect() unconditionally.

I'd be ok not having the Qt version check at all and just simply using the ::connect syntax

Actually, callOnTimeout() is just a template that calls connect() anyway:

template <typename ... Args>
QMetaObject::Connection callOnTimeout(Args && ...args)
{
    return QObject::connect(this, &QTimer::timeout, std::forward<Args>(args)... );
}

Good catch, thanks for the patch. Please commit

Commited in eb958bf9544e74eff67556d95716431a7c11774b

Import of htmlentitydefs has also changed with python3

The link in store.kde.org is here:
https://store.kde.org/browse/cat/589/

Both categories were created and the products were imported.