From c56b308ab55af5cf8282553deafbce5ca70829b3 Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 8 Sep 2016 16:17:55 +0200 Subject: [PATCH 1/2] Fix link error when llvm is in /usr but Qt isn't LLVM_LIBDIR=/usr was making this code insert -Wl,-rpath,/usr/lib64 into the link line, which leads to link errors due to libQt5Qml.so being picked up from there rather than from where the rest of my self-built Qt is. (Qt5Qml is an indirect dependency of the other libs on the link line) Change-Id: I76164905ede416ba2fb895fda372c08633777f4f Reviewed-by: Nikita Baryshnikov Reviewed-by: Christian Stenger Reviewed-by: Eike Ziller --- src/tools/clangbackend/clangbackend.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/clangbackend/clangbackend.pro b/src/tools/clangbackend/clangbackend.pro index c3210fedbfb..e1e08c9cb0d 100644 --- a/src/tools/clangbackend/clangbackend.pro +++ b/src/tools/clangbackend/clangbackend.pro @@ -16,5 +16,5 @@ SOURCES += clangbackendmain.cpp unix { !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}) } From 47ede6dc4244f30a08d8b5a04c9b34aea186aa59 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 23 Sep 2016 14:54:34 +0200 Subject: [PATCH 2/2] Debugger: Fix expansion of items in tool tips Task-number: QTCREATORBUG-16947 Change-Id: Id38b7dbf2773f04d2298a7dfee68fc0f280806e4 Reviewed-by: Christian Stenger --- src/plugins/debugger/debuggertooltipmanager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index a34a0b41c0d..4b53f12e230 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/src/plugins/debugger/debuggertooltipmanager.cpp @@ -219,7 +219,7 @@ ToolTipWatchItem::ToolTipWatchItem(TreeItem *item) type = model->data(idx.sibling(idx.row(), 2), Qt::DisplayRole).toString(); iname = model->data(idx.sibling(idx.row(), 0), LocalsINameRole).toString(); valueColor = model->data(idx.sibling(idx.row(), 1), Qt::ForegroundRole).value(); - expandable = item->hasChildren(); + expandable = model->hasChildren(idx); expression = model->data(idx.sibling(idx.row(), 0), Qt::EditRole).toString(); foreach (TreeItem *child, item->children()) appendChild(new ToolTipWatchItem(child)); @@ -270,7 +270,7 @@ public: WatchItem *it = m_engine->watchHandler()->findItem(iname); QTC_ASSERT(it, return); - it->fetchMore(); + it->model()->fetchMore(it->index()); } void restoreTreeModel(QXmlStreamReader &r);