diff --git a/main.cpp b/main.cpp index c10ebf3..e015c49 100644 --- a/main.cpp +++ b/main.cpp @@ -92,7 +92,10 @@ int main(int argc, char *argv[]) #endif // USING_QT_5 if (! QGLFormat::hasOpenGL()) + { qFatal("This system has no OpenGL support."); + return 1; + } // Create splash screen. QPixmap pixmap(":/mapmap-splash"); @@ -106,11 +109,6 @@ int main(int argc, char *argv[]) bool FORCE_FRENCH_LANG = false; // set_language_to_french(app); - if (FORCE_FRENCH_LANG) // XXX FIXME this if seems wrong - { - std::cerr << "This system has no OpenGL support" << std::endl; - return 1; - } // Let splash for at least one second. I::sleep(1); @@ -123,7 +121,7 @@ int main(int argc, char *argv[]) app.setFont(QFont(":/base-font", 10, QFont::Bold)); // Load stylesheet. - QFile stylesheet("mapmap.qss"); + QFile stylesheet(":/stylesheet"); stylesheet.open(QFile::ReadOnly); app.setStyleSheet(QLatin1String(stylesheet.readAll())); diff --git a/mapmap.qrc b/mapmap.qrc index 069ec00..561c045 100644 --- a/mapmap.qrc +++ b/mapmap.qrc @@ -46,6 +46,8 @@ resources/fonts/HelveticaNeueLTPro-Bd.otf resources/images/test-signal/test-signal.svg + + resources/qss/mapmap.qss diff --git a/mapmap.qss b/resources/qss/mapmap.qss similarity index 100% rename from mapmap.qss rename to resources/qss/mapmap.qss