StelApp.cpp   StelApp.cpp 
skipping to change at line 229 skipping to change at line 229
// We use OpenGL 2.1 features in our shaders // We use OpenGL 2.1 features in our shaders
useGLShaders = useGLShaders && (QGLFormat::openGLVersionFlags().test Flag(QGLFormat::OpenGL_Version_2_1) || QGLFormat::openGLVersionFlags().test Flag(QGLFormat::OpenGL_ES_Version_2_0)); useGLShaders = useGLShaders && (QGLFormat::openGLVersionFlags().test Flag(QGLFormat::OpenGL_Version_2_1) || QGLFormat::openGLVersionFlags().test Flag(QGLFormat::OpenGL_ES_Version_2_0));
#else #else
useGLShaders = true; useGLShaders = true;
#endif #endif
// Initialize AFTER creation of openGL context // Initialize AFTER creation of openGL context
textureMgr = new StelTextureMgr(); textureMgr = new StelTextureMgr();
textureMgr->init(); textureMgr->init();
QString splashFileName = "textures/logo24bits.png";
#ifdef BUILD_FOR_MAEMO #ifdef BUILD_FOR_MAEMO
StelLoadingBar loadingBar("textures/logo24bits.png", "", 25, 320, 10 1, 800, 400); StelLoadingBar loadingBar(splashFileName, "", 25, 320, 101, 800, 400 );
#else #else
#ifdef BZR_REVISION #ifdef BZR_REVISION
StelLoadingBar loadingBar("textures/logo24bits.png", QString("BZR r% 1").arg(BZR_REVISION), 25, 320, 101); StelLoadingBar loadingBar(splashFileName, QString("BZR r%1").arg(BZR _REVISION), 25, 320, 101);
#elif SVN_REVISION #elif SVN_REVISION
StelLoadingBar loadingBar("textures/logo24bits.png", QString("SVN r% 1").arg(SVN_REVISION), 25, 320, 101); StelLoadingBar loadingBar(splashFileName, QString("SVN r%1").arg(SVN _REVISION), 25, 320, 101);
#else #else
StelLoadingBar loadingBar("textures/logo24bits.png", PACKAGE_VERSION , 45, 320, 121); StelLoadingBar loadingBar(splashFileName, PACKAGE_VERSION, 45, 320, 121);
#endif #endif
#endif #endif
loadingBar.draw(); loadingBar.draw();
networkAccessManager = new QNetworkAccessManager(this); networkAccessManager = new QNetworkAccessManager(this);
// Activate http cache if Qt version >= 4.5 // Activate http cache if Qt version >= 4.5
QNetworkDiskCache* cache = new QNetworkDiskCache(networkAccessManage r); QNetworkDiskCache* cache = new QNetworkDiskCache(networkAccessManage r);
QString cachePath = StelFileMgr::getCacheDir(); QString cachePath = StelFileMgr::getCacheDir();
qDebug() << "Cache directory is: " << cachePath; qDebug() << "Cache directory is: " << cachePath;
 End of changes. 5 change blocks. 
4 lines changed or deleted 6 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/