diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-06-05 11:14:48 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-06-05 11:14:48 +0200 |
| commit | 4acece6d9ee6b266f5c34eeca7dcaf94b4815f08 (patch) | |
| tree | 8b2771bd5d2a3fd97965266aa6b1c000b57b1b18 /src/plugins/qmljstools/qmlconsoleitemdelegate.cpp | |
| parent | cd028ac14f0f16d214d911f5f81e9664d3693082 (diff) | |
| parent | 1120581ba9a3bbdf87e261d069623e3af0b1d7ba (diff) | |
| download | qt-creator-4acece6d9ee6b266f5c34eeca7dcaf94b4815f08.tar.gz | |
Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
src/plugins/qmlprofiler/qmlprofilerengine.cpp
Change-Id: I95c2c4116e28683fafcc0a557a7913d67361dcd4
Diffstat (limited to 'src/plugins/qmljstools/qmlconsoleitemdelegate.cpp')
| -rw-r--r-- | src/plugins/qmljstools/qmlconsoleitemdelegate.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp b/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp index 03af88b55f..def7176d3b 100644 --- a/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp +++ b/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp @@ -34,6 +34,7 @@ #include <QTreeView> #include <QScrollBar> #include <QTextLayout> +#include <QUrl> const char CONSOLE_LOG_BACKGROUND_COLOR[] = "#E8EEF2"; const char CONSOLE_WARNING_BACKGROUND_COLOR[] = "#F6F4EB"; @@ -216,6 +217,9 @@ void QmlConsoleItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem if (showFileLineInfo) { // Check for file info QString file = index.data(QmlConsoleItemModel::FileRole).toString(); + const QUrl fileUrl = QUrl(file); + if (fileUrl.isLocalFile()) + file = fileUrl.toLocalFile(); if (!file.isEmpty()) { QFontMetrics fm(option.font); // Paint FileArea |