feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.1'

Browse Source 
Change-Id: Ife660a3b9fb05582cc88d970e7f1162712d26cd4
This commit is contained in:
Eike Ziller
2016-09-26 12:37:17 +02:00
parent c7305abf26 47ede6dc42
commit 8c6e305a28
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debuggertooltipmanager.cpp
View File

@@ -219,7 +219,7 @@ ToolTipWatchItem::ToolTipWatchItem(TreeItem *item)
type = model->data(idx.sibling(idx.row(), 2), Qt::DisplayRole).toString(); type = model->data(idx.sibling(idx.row(), 2), Qt::DisplayRole).toString();
iname = model->data(idx.sibling(idx.row(), 0), LocalsINameRole).toString(); iname = model->data(idx.sibling(idx.row(), 0), LocalsINameRole).toString();
valueColor = model->data(idx.sibling(idx.row(), 1), Qt::ForegroundRole).value<QColor>(); valueColor = model->data(idx.sibling(idx.row(), 1), Qt::ForegroundRole).value<QColor>();
expandable = item->hasChildren(); expandable = model->hasChildren(idx);
expression = model->data(idx.sibling(idx.row(), 0), Qt::EditRole).toString(); expression = model->data(idx.sibling(idx.row(), 0), Qt::EditRole).toString();
foreach (TreeItem *child, item->children()) foreach (TreeItem *child, item->children())
appendChild(new ToolTipWatchItem(child)); appendChild(new ToolTipWatchItem(child));
@@ -270,7 +270,7 @@ public:
WatchItem *it = m_engine->watchHandler()->findItem(iname); WatchItem *it = m_engine->watchHandler()->findItem(iname);
QTC_ASSERT(it, return); QTC_ASSERT(it, return);
it->fetchMore(); it->model()->fetchMore(it->index());
} }
void restoreTreeModel(QXmlStreamReader &r); void restoreTreeModel(QXmlStreamReader &r);

2
src/tools/clangbackend/clangbackend.pro
View File

@@ -16,5 +16,5 @@ SOURCES += clangbackendmain.cpp
unix { unix {
!osx: QMAKE_LFLAGS += -Wl,-z,origin !osx: QMAKE_LFLAGS += -Wl,-z,origin
!disable_external_rpath: QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR}) !contains(QMAKE_DEFAULT_LIBDIRS, $${LLVM_LIBDIR}):!disable_external_rpath: QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR})
} }