mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-08 18:54:09 -04:00
QtCurve disable reading of config files
This commit is contained in:
parent
d7a2bbb2cf
commit
b37a8caeb7
@ -976,6 +976,7 @@ class QtCConfig
|
|||||||
|
|
||||||
QtCConfig::QtCConfig(const QString &filename)
|
QtCConfig::QtCConfig(const QString &filename)
|
||||||
{
|
{
|
||||||
|
if (filename.isEmpty()) return; // Changed by Kovid to ensure config files are never read
|
||||||
QFile f(filename);
|
QFile f(filename);
|
||||||
|
|
||||||
#if QT_VERSION >= 0x040000
|
#if QT_VERSION >= 0x040000
|
||||||
@ -1748,17 +1749,13 @@ bool qtcReadConfig(const char *file, Options *opts, Options *defOpts)
|
|||||||
#endif
|
#endif
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
// Changed by Kovid to ensure config files are never read
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
QtCConfig cfg(file);
|
QtCConfig cfg(QString(""));
|
||||||
|
|
||||||
if(cfg.ok())
|
|
||||||
{
|
|
||||||
#else
|
#else
|
||||||
GHashTable *cfg=loadConfig(file);
|
GHashTable *cfg=NULL;
|
||||||
|
|
||||||
if(cfg)
|
|
||||||
{
|
|
||||||
#endif
|
#endif
|
||||||
|
if (0) {
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
opts->version=readVersionEntry(cfg, VERSION_KEY);
|
opts->version=readVersionEntry(cfg, VERSION_KEY);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user