StelFileMgr.cpp   StelFileMgr.cpp 
skipping to change at line 114 skipping to change at line 114
QFileInfo checkFile(installLocation.filePath() + QString("/" ) + QString(CHECK_FILE)); QFileInfo checkFile(installLocation.filePath() + QString("/" ) + QString(CHECK_FILE));
#elif defined(Q_OS_WIN) #elif defined(Q_OS_WIN)
QFileInfo installLocation(QCoreApplication::applicationDirPa th()); QFileInfo installLocation(QCoreApplication::applicationDirPa th());
QFileInfo checkFile(installLocation.filePath() + QDir::separ ator() + QString(CHECK_FILE)); QFileInfo checkFile(installLocation.filePath() + QDir::separ ator() + QString(CHECK_FILE));
#else #else
// Linux, BSD, Solaris etc. // Linux, BSD, Solaris etc.
// We use the value from the config.h filesystem // We use the value from the config.h filesystem
QFileInfo installLocation(QFile::decodeName(INSTALL_DATADIR) ); QFileInfo installLocation(QFile::decodeName(INSTALL_DATADIR) );
QFileInfo checkFile(QFile::decodeName(INSTALL_DATADIR "/" CH ECK_FILE)); QFileInfo checkFile(QFile::decodeName(INSTALL_DATADIR "/" CH ECK_FILE));
#endif #endif
#ifndef NDEBUG
if (!checkFile.exists())
{ // for DEBUG use sources location
QString debugDataPath = INSTALL_DATADIR_FOR_DEBUG;
checkFile = QFileInfo(debugDataPath + QDir::separato
r() + CHECK_FILE);
installLocation = QFileInfo(debugDataPath);
}
#endif
if (checkFile.exists()) if (checkFile.exists())
{ {
installDir = installLocation.filePath(); installDir = installLocation.filePath();
} }
else else
{ {
qWarning() << "WARNING StelFileMgr::StelFileMgr: cou ld not find install location:" << qWarning() << "WARNING StelFileMgr::StelFileMgr: cou ld not find install location:" <<
QDir::toNativeSeparators(installLocation.fil ePath()) << " (we checked for " << QDir::toNativeSeparators(installLocation.fil ePath()) << " (we checked for " <<
QDir::toNativeSeparators(checkFile.filePath( )) << ")."; QDir::toNativeSeparators(checkFile.filePath( )) << ").";
#ifndef UNIT_TEST
// NOTE: Hook for buildbots (using within testEpheme
ris)
qFatal("Couldn't find install directory location."); qFatal("Couldn't find install directory location.");
#endif
} }
} }
// Then add the installation directory to the search path // Then add the installation directory to the search path
fileLocations.append(installDir); fileLocations.append(installDir);
} }
QString StelFileMgr::findFile(const QString& path, Flags flags) QString StelFileMgr::findFile(const QString& path, Flags flags)
{ {
if (path.isEmpty()) if (path.isEmpty())
 End of changes. 3 change blocks. 
0 lines changed or deleted 15 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/