Merge remote-tracking branch 'origin/4.5'

Conflicts:
	src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
	src/plugins/qmlprofiler/qmlprofilertraceclient.cpp

Change-Id: I94647f59d7a9df48168ac066555afe80f5f9b91f
This commit is contained in:
Oswald Buddenhagen
2017-12-21 13:20:24 +01:00
22 changed files with 84 additions and 55 deletions
+1 -1
View File
@@ -1151,7 +1151,7 @@ class Dumper(DumperBase):
# values = [frame.FindVariable(partialVariable)]
#else:
if True:
values = list(frame.GetVariables(True, True, False, False))
values = list(frame.GetVariables(True, True, False, True))
values.reverse() # To get shadowed vars numbered backwards.
variables = []