Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

[IconTheme] Fixed setting fallback icon theme

Browse Source 
Closes #1274

[ci skip]
This commit is contained in:
nowrep 2014-04-07 09:30:42 +02:00
parent 7824f3862e
commit 78ba3875d9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/app/mainapplication.cpp
View File

@ -110,6 +110,12 @@ MainApplication::MainApplication(int &argc, char** argv)
setOrganizationDomain(QLatin1String("qupzilla")); setOrganizationDomain(QLatin1String("qupzilla"));
setWindowIcon(QIcon(QLatin1String(":icons/exeicons/qupzilla-window.png"))); setWindowIcon(QIcon(QLatin1String(":icons/exeicons/qupzilla-window.png")));
// Set fallback icon theme (eg. on Windows/Mac)
if (QIcon::fromTheme(QSL("view-refresh")).isNull()) {
QIcon::setThemeSearchPaths(QStringList() << QL1S(":/oxygen-fallback"));
QIcon::setThemeName(QSL("oxygen-fallback"));
}
QUrl startUrl; QUrl startUrl;
QString startProfile; QString startProfile;
QStringList messages; QStringList messages;

12
src/main/main.cpp
View File

@ -159,24 +159,18 @@ int main(int argc, char* argv[])
#endif #endif
#if defined(QZ_WS_X11) && QT_VERSION < 0x050000 #if defined(QZ_WS_X11) && QT_VERSION < 0x050000
QApplication::setGraphicsSystem("raster"); // Better overall performance on X11 // Better overall performance on X11
QApplication::setGraphicsSystem(QSL("raster"));
#endif #endif
#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) #if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__)
signal(SIGSEGV, qupzilla_signal_handler); signal(SIGSEGV, qupzilla_signal_handler);
#endif #endif
// Set fallback icon theme (eg. on Windows/Mac)
if (QIcon::fromTheme(QSL("document-open")).isNull()) {
QIcon::setThemeSearchPaths(QStringList() << QL1S(":/oxygen-fallback"));
QIcon::setThemeName(QSL("oxygen-fallback"));
}
MainApplication app(argc, argv); MainApplication app(argc, argv);
if (app.isClosing()) { if (app.isClosing())
return 0; return 0;
}
app.setProxyStyle(new ProxyStyle); app.setProxyStyle(new ProxyStyle);