schedule.en.xml is now in resource

 - for testing only
 - will be removed from final application

diff --git a/src/app/app.pro b/src/app/app.pro
index fae9f9eda89ba651fcb015cdc31c86f67b8c13f5..02fe6a0209a63130132ebaf960bd1b4423a25e08 100644 (file)
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -12,5 +12,6 @@ TARGETDEPS += $$DESTDIR/libmvc.a $$DESTDIR/libgui.a $$DESTDIR/libsql.a
 SOURCES += main.cpp
 
 RESOURCES += ../icons.qrc \
-             ../maps.qrc
+             ../maps.qrc \
+             ../schedule.qrc
 

diff --git a/src/app/main.cpp b/src/app/main.cpp
index f39da7a23fb61c602cdfec7a4ad9f3c5fdb9d9d1..f8ac9dadbe0996ff6bbd57ce29586971b019479b 100644 (file)
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -5,6 +5,8 @@
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(icons);
+    Q_INIT_RESOURCE(maps);
+    Q_INIT_RESOURCE(schedule);
 
     QApplication a(argc, argv);
     QApplication::setWindowIcon(QIcon(":/icons/fosdem.png"));

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 5f7a5e33a3d9d5dc9f5fc8a6dfc74155cece997e..ac971adc14b61a28df8cadbb655aeea09e9304de 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -115,7 +115,7 @@ MainWindow::~MainWindow()
 
 void MainWindow::importSchedule()
 {
-    QFile file("../schedule.en.xml");
+    QFile file(":/schedule.en.xml");
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
     {
         qDebug() << "can't open " << file.fileName();

diff --git a/src/schedule.qrc b/src/schedule.qrc
new file mode 100644 (file)
index 0000000..814136b
--- /dev/null
+++ b/src/schedule.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>schedule.en.xml</file>
+</qresource>
+</RCC>