From e9620aa3b1a7741faaf97c924858413cfd28f5c4 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 27 Oct 2011 10:54:47 +0200
Subject: [PATCH] debugger: fix hard-coded location of declarative debug
symbols
This really should not be needed to start with.
Change-Id: Ife4349fe2d590c7a379d30b59a83bc9f54aeb063
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/debugger/debuggerplugin.cpp | 2 +-
tests/manual/debugger/simple/simple_test_app.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 0f6b513a08c..55cf1193387 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1211,7 +1211,7 @@ void DebuggerPluginPrivate::maybeEnrichParameters(DebuggerStartParameters *sp)
sp->debugSourceLocation.append(base + "qt5base/src/gui");
sp->debugSourceLocation.append(base + "qt5base/src/network");
sp->debugSourceLocation.append(base + "qt5base/src/v8");
- sp->debugSourceLocation.append(base + "qtdeclarative/src/declarative/qml");
+ sp->debugSourceLocation.append(base + "qt5declarative/src/declarative/qml");
}
}
diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp
index b89577121cc..0c1273687b1 100644
--- a/tests/manual/debugger/simple/simple_test_app.cpp
+++ b/tests/manual/debugger/simple/simple_test_app.cpp
@@ -3681,6 +3681,7 @@ namespace valgrind {
void testValgrind()
{
testLeak();
+ throw 42;
}
} // namespace valgrind
@@ -3726,6 +3727,7 @@ int main(int argc, char *argv[])
{
// For a very quick check, step into this one.
sanity::testSanity();
+ valgrind::testValgrind();
// Check for normal dumpers.
basic::testBasic();
@@ -3790,8 +3792,6 @@ int main(int argc, char *argv[])
qvariant::testQVariant();
qvector::testQVector();
- valgrind::testValgrind();
-
// Third party data types.
boost::testBoost();
eigen::testEigen();
--
GitLab