Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-04-29 05:03:03 +02:00
Code Issues Projects Releases Wiki Activity

Workaround for crash when running job (conversion to PDF or MOBI/reading metadata from epub without cover) that requires Qt WebKit on Ubuntu. Fixes #1360693 [Ubuntu: Import EPUB, Metadata Error](https://bugs.launchpad.net/calibre/+bug/1360693)

Browse source 
See https://bugreports.qt-project.org/browse/QTBUG-40946
This commit is contained in:
Kovid Goyal 2014-08-24 22:27:39 +05:30
parent a9dab307fb
commit 83b3e2cf19
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/calibre/headless/headless_integration.cpp
View file

@ -14,6 +14,15 @@
QT_BEGIN_NAMESPACE
class GenericUnixServices : public QGenericUnixServices {
/* We must return desktop environment as UNKNOWN otherwise other parts of
* Qt will try to query the nativeInterface() without checking if it exists
* leading to a segfault. For example, defaultHintStyleFromMatch() queries
* the nativeInterface() without checking that it is NULL. See
* https://bugreports.qt-project.org/browse/QTBUG-40946 */
QByteArray desktopEnvironment() const { return QByteArrayLiteral("UNKNOWN"); }
};
HeadlessIntegration::HeadlessIntegration(const QStringList &parameters)
{
Q_UNUSED(parameters);
@ -26,7 +35,7 @@ HeadlessIntegration::HeadlessIntegration(const QStringList &parameters)
screenAdded(mPrimaryScreen);
m_fontDatabase.reset(new QFontconfigDatabase());
platform_services.reset(new QGenericUnixServices());
platform_services.reset(new GenericUnixServices());
}
HeadlessIntegration::~HeadlessIntegration()