diff options
author | Tomaz Canabrava <tcanabrava@kde.org> | 2016-12-27 13:31:30 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2016-12-27 08:27:21 -0800 |
commit | 27b4ef321ade223902ab083aa5a100962c7295f9 (patch) | |
tree | 5b6a8b7f3ef6123cf24988e59329edf319252027 | |
parent | a842e44b685dbb7e34df317a8beacff747cee6bd (diff) | |
download | subsurface-27b4ef321ade223902ab083aa5a100962c7295f9.tar.gz |
Correctly open the resource file
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | core/qthelper.cpp | 2 | ||||
-rw-r--r-- | tests/testparse.cpp | 6 | ||||
-rw-r--r-- | tests/testparse.h | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/core/qthelper.cpp b/core/qthelper.cpp index e0a5b1556..885e89d98 100644 --- a/core/qthelper.cpp +++ b/core/qthelper.cpp @@ -320,7 +320,7 @@ static xmlDocPtr get_stylesheet_doc(const xmlChar *uri, xmlDictPtr, int, void *, QFile f(QLatin1String(":/xslt/") + (const char *)uri); if (!f.open(QIODevice::ReadOnly)) { if (verbose > 0) { - qDebug() << "cannot open stylesheet" << QLatin1String(":/xslt/") + (const char *)uri; + qDebug() << "cannot open stylesheet" << QLatin1String(":/xslt/") + (const char *)uri << f.errorString(); return NULL; } } diff --git a/tests/testparse.cpp b/tests/testparse.cpp index 8d4cedb43..e9d313e5d 100644 --- a/tests/testparse.cpp +++ b/tests/testparse.cpp @@ -4,6 +4,12 @@ #include "core/divelist.h" #include <QTextStream> +void TestParse::initTestCase() +{ + /* we need to manually tell that the resource exists, because we are using it as library. */ + Q_INIT_RESOURCE(subsurface); +} + char *intdup(int index) { char tmpbuf[21]; diff --git a/tests/testparse.h b/tests/testparse.h index 5616f0718..d99f9e53e 100644 --- a/tests/testparse.h +++ b/tests/testparse.h @@ -6,6 +6,7 @@ class TestParse : public QObject{ Q_OBJECT private slots: + void initTestCase(); void testParseCSV(); void testParseDivingLog(); void testParseV2NoQuestion(); |