Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-19 03:18:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #463 from PhenomRetroShare/Fix_ImageBlockOnRsTextBrowser

Browse source 
Fix Image Block on RSTextBrowser.
This commit is contained in:
Cyril Soler 2016-08-08 22:10:01 +02:00 • committed by GitHub
commit 9c601dc478
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/common/RSTextBrowser.cpp
View file

@ -92,7 +92,12 @@ QVariant RSTextBrowser::loadResource(int type, const QUrl &name)
if (mImageBlockWidget) if (mImageBlockWidget)
mImageBlockWidget->show(); mImageBlockWidget->show();
//https://git.merproject.org/lbt/qtbase/commit/6d13e9f29597e0d557857e3f80173faba5368424
#if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)
return QPixmap(":/qt-project.org/styles/commonstyle/images/file-16.png");
#else
return QPixmap(":/trolltech/styles/commonstyle/images/file-16.png"); return QPixmap(":/trolltech/styles/commonstyle/images/file-16.png");
#endif
} }
void RSTextBrowser::setImageBlockWidget(RSImageBlockWidget *widget) void RSTextBrowser::setImageBlockWidget(RSImageBlockWidget *widget)