1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00

Merge pull request #525 from srazi/master

Fixed compile error about accessing private assignment's operator of QFileIconProvider
This commit is contained in:
David Rosca 2012-08-24 09:01:36 -07:00
commit abe5e5d885

View File

@ -138,7 +138,6 @@ QString FileSchemeReply::loadDirectory()
{ {
const QDir &dir = QDir(request().url().toLocalFile()); const QDir &dir = QDir(request().url().toLocalFile());
const QFileInfoList &list = dir.entryInfoList(QDir::AllEntries | QDir::Hidden, QDir::Name | QDir::DirsFirst); const QFileInfoList &list = dir.entryInfoList(QDir::AllEntries | QDir::Hidden, QDir::Name | QDir::DirsFirst);
const QFileIconProvider &iconProvider = QFileIconProvider();
static QString sPage; static QString sPage;
@ -182,7 +181,7 @@ QString FileSchemeReply::loadDirectory()
} }
line += "><td class=\"td-name\" style=\"background-image:url(data:image/png;base64,"; line += "><td class=\"td-name\" style=\"background-image:url(data:image/png;base64,";
line += qz_pixmapToByteArray(iconProvider.icon(info).pixmap(16)); line += qz_pixmapToByteArray(QFileIconProvider().icon(info).pixmap(16));
line += ");\">"; line += ");\">";
line += "<a href=\""; line += "<a href=\"";
line += QUrl::fromLocalFile(info.absoluteFilePath()).toEncoded(); line += QUrl::fromLocalFile(info.absoluteFilePath()).toEncoded();