main.cpp   main.cpp 
skipping to change at line 261 skipping to change at line 261
copyDefaultConfigFile(configFileFullPath); copyDefaultConfigFile(configFileFullPath);
confSettings = new QSettings(configFileFullPath, StelIniForm at); confSettings = new QSettings(configFileFullPath, StelIniForm at);
} }
Q_ASSERT(confSettings); Q_ASSERT(confSettings);
qDebug() << "Config file is: " << configFileFullPath; qDebug() << "Config file is: " << configFileFullPath;
// Override config file values from CLI. // Override config file values from CLI.
CLIProcessor::parseCLIArgsPostConfig(argList, confSettings); CLIProcessor::parseCLIArgsPostConfig(argList, confSettings);
#ifdef Q_OS_WIN
bool safeMode = false; // used in Q_OS_WIN, but need the QGL::setPre ferredPaintEngine() call here. bool safeMode = false; // used in Q_OS_WIN, but need the QGL::setPre ferredPaintEngine() call here.
#endif
if (!confSettings->value("main/use_qpaintenginegl2", true).toBool() if (!confSettings->value("main/use_qpaintenginegl2", true).toBool()
|| qApp->property("onetime_safe_mode").isValid()) { || qApp->property("onetime_safe_mode").isValid()) {
// The user explicitely request to use the older paint engin e. // The user explicitely request to use the older paint engin e.
QGL::setPreferredPaintEngine(QPaintEngine::OpenGL); QGL::setPreferredPaintEngine(QPaintEngine::OpenGL);
#ifdef Q_OS_WIN
safeMode = true; safeMode = true;
#endif
} }
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
// On Leopard (10.5) + ppc architecture, text display is buggy if Op enGL2 Qt paint engine is used. // On Leopard (10.5) + ppc architecture, text display is buggy if Op enGL2 Qt paint engine is used.
if ((QSysInfo::MacintoshVersion == QSysInfo::MV_LEOPARD) && (QSysInf o::ByteOrder == QSysInfo::BigEndian)) if ((QSysInfo::MacintoshVersion == QSysInfo::MV_LEOPARD) && (QSysInf o::ByteOrder == QSysInfo::BigEndian))
QGL::setPreferredPaintEngine(QPaintEngine::OpenGL); QGL::setPreferredPaintEngine(QPaintEngine::OpenGL);
#endif #endif
// On maemo we'll use the standard OS font // On maemo we'll use the standard OS font
#ifndef BUILD_FOR_MAEMO #ifndef BUILD_FOR_MAEMO
 End of changes. 4 change blocks. 
0 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/