diff options
| author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-17 19:29:10 +0800 |
|---|---|---|
| committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-17 19:29:10 +0800 |
| commit | abb9b7f46ff3b2ef0bb4f2e95f029591688768c4 (patch) | |
| tree | c4088c788b3e86935a2b8fd2fbe157340476f091 /Godeps | |
| parent | fbd5e4d5afeaff6c250a3a953b18476cdb4b86ae (diff) | |
| parent | c934222a8089b19587242a3b0bc71ea0aec1d5ef (diff) | |
| download | go-tangerine-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar go-tangerine-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.gz go-tangerine-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.bz2 go-tangerine-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.lz go-tangerine-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.xz go-tangerine-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.zst go-tangerine-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.zip | |
Merge branch 'develop' into ui
Diffstat (limited to 'Godeps')
| -rw-r--r-- | Godeps/Godeps.json | 2 | ||||
| -rw-r--r-- | Godeps/_workspace/src/github.com/obscuren/qml/cpp/capi.cpp | 2 |
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); |