diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-12-12 09:44:13 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-12-12 09:44:13 +0100 |
| commit | 9084ca73dff77d3df8ce564a19016dfeb482ea6d (patch) | |
| tree | d2adbbe2b307fd51c9dd347cc5cd4be7f9fe9203 /share | |
| parent | 1a2a278eec7a8438006246f47932d614804e3894 (diff) | |
| parent | 5cd4a73acab1ee3782747d5de55c0ae734bfba2f (diff) | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/cpptools/compileroptionsbuilder.cpp
Change-Id: I87f47cecbb924064296a002fd9446a0627acad8e
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/debugger/gdbbridge.py | 8 | ||||
| -rw-r--r-- | share/qtcreator/debugger/lldbbridge.py | 7 | ||||
| -rw-r--r-- | share/qtcreator/translations/qtcreator_ru.ts | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py index cdde71b3ff..c6e6adc55f 100644 --- a/share/qtcreator/debugger/gdbbridge.py +++ b/share/qtcreator/debugger/gdbbridge.py @@ -246,17 +246,13 @@ class Dumper(DumperBase): #warn('TARGET TYPE: %s' % targetType) if targetType.code == gdb.TYPE_CODE_ARRAY: val = self.Value(self) - val.laddress = toInteger(nativeValue.address) - val.nativeValue = nativeValue else: # Cast may fail (e.g for arrays, see test for Bug5799) val = self.fromNativeValue(nativeValue.cast(targetType)) - val.type = self.fromNativeType(nativeType) - val.nativeValue = nativeValue #warn('CREATED TYPEDEF: %s' % val) - return val + else: + val = self.Value(self) - val = self.Value(self) val.nativeValue = nativeValue if not nativeValue.address is None: val.laddress = toInteger(nativeValue.address) diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index 6cccd84fba..6093b94f78 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -2275,3 +2275,10 @@ def __lldb_init_module(debugger, internal_dict): if not __name__ == 'qt': # Make available under global 'qt' name for consistency internal_dict['qt'] = internal_dict[__name__] + + +if __name__ == "lldbbridge": + try: + theDumper = Dumper() + except Exception as error: + print('@\nstate="enginesetupfailed",error="{}"@\n'.format(error)) diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index c2dc93dd48..12099db2d0 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -28666,7 +28666,7 @@ Preselects a desktop Qt for building the application if available.</source> </message> <message> <source>Empty qmake Project</source> - <translation>Пустрой проект qmake</translation> + <translation>Пустой проект qmake</translation> </message> <message> <source>Define Project Details</source> |