aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-02-17 02:43:27 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-02-17 02:43:27 +0800
commit643eda5c2d3190147bc55ef27c4ce241c7c59da2 (patch)
treea8d7530a7f7b8b382d8b7b6781239b89e84ff12c
parentcb345027284527ce700512f2734116d3ca2f6cdf (diff)
downloadgo-tangerine-643eda5c2d3190147bc55ef27c4ce241c7c59da2.tar.gz
go-tangerine-643eda5c2d3190147bc55ef27c4ce241c7c59da2.tar.zst
go-tangerine-643eda5c2d3190147bc55ef27c4ce241c7c59da2.zip
Update obscuren/qml revision
-rw-r--r--Godeps/Godeps.json2
-rw-r--r--Godeps/_workspace/src/github.com/obscuren/qml/cpp/capi.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 1ecdce06f..831140690 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -67,7 +67,7 @@
},
{
"ImportPath": "github.com/obscuren/qml",
- "Rev": "807b51d4104231784fa5e336ccd26d61759a3cb2"
+ "Rev": "c288002b52e905973b131089a8a7c761d4a2c36a"
},
{
"ImportPath": "github.com/rakyll/globalconf",
diff --git a/Godeps/_workspace/src/github.com/obscuren/qml/cpp/capi.cpp b/Godeps/_workspace/src/github.com/obscuren/qml/cpp/capi.cpp
index c2255aaae..024e5ec9c 100644
--- a/Godeps/_workspace/src/github.com/obscuren/qml/cpp/capi.cpp
+++ b/Godeps/_workspace/src/github.com/obscuren/qml/cpp/capi.cpp
@@ -855,6 +855,8 @@ QQmlListProperty_ *newListProperty(GoAddr *addr, intptr_t reflectIndex, intptr_t
void internalLogHandler(QtMsgType severity, const QMessageLogContext &context, const QString &text)
{
+ if (context.file == NULL) return;
+
QByteArray textba = text.toUtf8();
LogMessage message = {severity, textba.constData(), textba.size(), context.file, (int)strlen(context.file), context.line};
hookLogHandler(&message);