Merge remote-tracking branch 'origin/3.6'

Conflicts: src/plugins/baremetal/gdbserverproviderprocess.cpp Change-Id: I1ba618db9db6669edada6477c05a1b56b7b5b430
openmv · Dec 7, 2015 · 9554495 · 9554495
2 parents 11cb55a + 89d8693
commit 9554495
Show file tree

Hide file tree

Showing 41 changed files with 465 additions and 228 deletions.
diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc
@@ -57,7 +57,7 @@
     the QML file). The image appears in \uicontrol Resources. You can also use
     any other image or a QML type, instead.
 
-    \list a
+    \list 1
 
         \li In the \uicontrol Projects view, double-click the MainForm.ui.qml
             file to open it in \QMLD.

diff --git a/qtcreator.pri b/qtcreator.pri
@@ -1,8 +1,8 @@
 !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included")
 QTCREATOR_PRI_INCLUDED = 1
 
-QTCREATOR_VERSION = 3.5.82
-QTCREATOR_COMPAT_VERSION = 3.5.82
+QTCREATOR_VERSION = 3.6.0
+QTCREATOR_COMPAT_VERSION = 3.6.0
 BINARY_ARTIFACTS_BRANCH = 3.6
 
 # enable c++11

diff --git a/qtcreator.qbs b/qtcreator.qbs
@@ -5,12 +5,12 @@ Project {
     minimumQbsVersion: "1.4.3"
     property bool withAutotests: qbs.buildVariant === "debug"
     property string ide_version_major: '3'
-    property string ide_version_minor: '5'
-    property string ide_version_release: '82'
+    property string ide_version_minor: '6'
+    property string ide_version_release: '0'
     property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release
     property string ide_compat_version_major: '3'
-    property string ide_compat_version_minor: '5'
-    property string ide_compat_version_release: '82'
+    property string ide_compat_version_minor: '6'
+    property string ide_compat_version_release: '0'
     property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release
     property path ide_source_tree: path
     property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin"

diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py
@@ -471,7 +471,7 @@ def exitSubItem(self, item, exType, exValue, exTraceBack):
                     self.put('type="%s",' % typeName) # str(type.unqualified()) ?
 
             if  self.currentValue.value is None:
-                self.put('value="",encoding="%d","numchild="0",'
+                self.put('value="",encoding="%d",numchild="0",'
                         % SpecialNotAccessibleValue)
             else:
                 if not self.currentValue.encoding is None:
@@ -1633,7 +1633,11 @@ def fromNativePath(str):
                     symtab = sal.symtab
                     if not symtab is None:
                         objfile = fromNativePath(symtab.objfile.filename)
-                        fileName = fromNativePath(symtab.fullname())
+                        fullname = symtab.fullname()
+                        if fullname is None:
+                            fileName = ""
+                        else:
+                            fileName = fromNativePath(fullname)
 
                 if self.nativeMixed and functionName == "qt_qmlDebugMessageAvailable":
                     interpreterStack = self.extractInterpreterStack()

diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py
@@ -1123,14 +1123,15 @@ def __init__(self, name, value):
                 self.value = value
 
         baseObjects = []
+        # GetNumberOfDirectBaseClasses() includes(!) GetNumberOfVirtualBaseClasses()
+        # so iterating over .GetNumberOfDirectBaseClasses() is correct.
         for i in xrange(value.GetType().GetNumberOfDirectBaseClasses()):
             baseClass = value.GetType().GetDirectBaseClassAtIndex(i).GetType()
             baseChildCount = baseClass.GetNumberOfFields() \
-                + baseClass.GetNumberOfDirectBaseClasses() \
-                + baseClass.GetNumberOfVirtualBaseClasses()
+                + baseClass.GetNumberOfDirectBaseClasses()
             if baseChildCount:
+                baseObjects.append(ChildItem(baseClass.GetName(), value.GetChildAtIndex(memberBase)))
                 memberBase += 1
-                baseObjects.append(ChildItem(baseClass.GetName(), value.GetChildAtIndex(i)))
             else:
                 # This base object is empty, but exists and will *not* be reported
                 # by value.GetChildCount(). So manually report the empty base class.

diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
@@ -3744,29 +3744,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
         <translation>Определяет, получает ли флажок фокус при нажатии или нет.</translation>
     </message>
 </context>
-<context>
-    <name>ClangCodeModel::Diagnostic</name>
-    <message>
-        <source>ignored</source>
-        <translation>пропущено</translation>
-    </message>
-    <message>
-        <source>note</source>
-        <translation>замечание</translation>
-    </message>
-    <message>
-        <source>warning</source>
-        <translation>предупреждение</translation>
-    </message>
-    <message>
-        <source>error</source>
-        <translation>ошибка</translation>
-    </message>
-    <message>
-        <source>fatal</source>
-        <translation>фатальная ошибка</translation>
-    </message>
-</context>
 <context>
     <name>ClangCodeModel::Internal::ClangCompletionAssistProcessor</name>
     <message>
@@ -3775,13 +3752,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
         <translation>Находится в %1</translation>
     </message>
 </context>
-<context>
-    <name>ClangCodeModel::Internal::ClangIndexer</name>
-    <message>
-        <source>Parsing C/C++/ObjC Files</source>
-        <translation>Разбор С/С++/ObjC файлов</translation>
-    </message>
-</context>
 <context>
     <name>ClangCodeModel::Internal::ClangProjectSettingsPropertiesPage</name>
     <message>
@@ -3815,14 +3785,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
         <source>Clang Settings</source>
         <translation>Настройки Clang</translation>
     </message>
-    <message>
-        <source>Header Files (*.h)</source>
-        <translation>Заголовочные файлы (*.h)</translation>
-    </message>
-    <message>
-        <source>All Files (*)</source>
-        <translation>Все файлы (*)</translation>
-    </message>
 </context>
 <context>
     <name>ClangCodeModel::Internal::ModelManagerSupport</name>
@@ -3832,21 +3794,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
         <translation>Clang</translation>
     </message>
 </context>
-<context>
-    <name>ClangCodeModel::Internal::PchManager</name>
-    <message>
-        <source>Successfully generated PCH file &quot;%1&quot;.</source>
-        <translation>Успешно создан PCH-файл «%1».</translation>
-    </message>
-    <message>
-        <source>Failed to generate PCH file &quot;%1&quot;.</source>
-        <translation>Не удалось создать PCH-файл «%1».</translation>
-    </message>
-    <message>
-        <source>Precompiling</source>
-        <translation>Прекомпиляция</translation>
-    </message>
-</context>
 <context>
     <name>ClangFormatSettings</name>
     <message>
@@ -17574,6 +17521,37 @@ You can choose between stashing the changes or discarding them.</source>
         <translation>GLSL</translation>
     </message>
 </context>
+<context>
+    <name>GridLayoutSpecifics</name>
+    <message>
+        <source>GridLayout</source>
+        <translation>GridLayout</translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation>Столбцы</translation>
+    </message>
+    <message>
+        <source>Rows</source>
+        <translation>Строки</translation>
+    </message>
+    <message>
+        <source>Flow</source>
+        <translation>Перетекание</translation>
+    </message>
+    <message>
+        <source>Layout Direction</source>
+        <translation>Направление компоновки</translation>
+    </message>
+    <message>
+        <source>Row Spacing</source>
+        <translation>Межстрочный интервал</translation>
+    </message>
+    <message>
+        <source>Column Spacing</source>
+        <translation>Межстолбцовый интервал</translation>
+    </message>
+</context>
 <context>
     <name>GridSpecifics</name>
     <message>
@@ -24194,7 +24172,7 @@ Preselects a desktop Qt for building the application if available.</source>
     </message>
     <message>
         <source>Stacked</source>
-        <translation type="unfinished">Уложеная</translation>
+        <translation>Уложеная</translation>
     </message>
     <message>
         <source>Make the new branch depend on the availability of the source branch.</source>
@@ -24218,11 +24196,11 @@ Preselects a desktop Qt for building the application if available.</source>
     </message>
     <message>
         <source>Switch checkout</source>
-        <translation type="unfinished">Сменить выгружаемый каталог</translation>
+        <translation>Сменить выгружаемый каталог</translation>
     </message>
     <message>
         <source>Switch the checkout in the current directory to the new branch.</source>
-        <translation type="unfinished">Переключить выгружаемый каталог текущего каталога на новую.</translation>
+        <translation>Переключить выгружаемый каталог текущего каталога на новую.</translation>
     </message>
     <message>
         <source>Hardlink</source>
@@ -24266,7 +24244,7 @@ Preselects a desktop Qt for building the application if available.</source>
     </message>
     <message>
         <source>Bazaar Clone (Or Branch)</source>
-        <translation type="unfinished">Клонирование Bazaar</translation>
+        <translation>Клонирование Bazaar</translation>
     </message>
     <message>
         <source>Module:</source>

diff --git a/src/libs/clangbackendipc/sourcelocationcontainer.cpp b/src/libs/clangbackendipc/sourcelocationcontainer.cpp
@@ -39,10 +39,10 @@ namespace ClangBackEnd {
 
 SourceLocationContainer::SourceLocationContainer(const Utf8String &filePath,
                                                  uint line,
-                                                 uint offset)
+                                                 uint column)
     : filePath_(filePath),
       line_(line),
-      offset_(offset)
+      column_(column)
 {
 }
 
@@ -57,16 +57,16 @@ uint SourceLocationContainer::line() const
 }
 
 
-uint SourceLocationContainer::offset() const
+uint SourceLocationContainer::column() const
 {
-    return offset_;
+    return column_;
 }
 
 QDataStream &operator<<(QDataStream &out, const SourceLocationContainer &container)
 {
     out << container.filePath_;
     out << container.line_;
-    out << container.offset_;
+    out << container.column_;
 
     return out;
 }
@@ -75,7 +75,7 @@ QDataStream &operator>>(QDataStream &in, SourceLocationContainer &container)
 {
     in >> container.filePath_;
     in >> container.line_;
-    in >> container.offset_;
+    in >> container.column_;
 
     return in;
 }
@@ -87,22 +87,24 @@ bool operator==(const SourceLocationContainer &first, const SourceLocationContai
 
 bool operator!=(const SourceLocationContainer &first, const SourceLocationContainer &second)
 {
-    return first.offset_ != second.offset_
+    return first.line_ != second.line_
+        || first.column_ != second.column_
         || first.filePath_ != second.filePath_;
 }
 
 bool operator<(const SourceLocationContainer &first, const SourceLocationContainer &second)
 {
     return first.filePath_ < second.filePath_
-        || (first.filePath_ == second.filePath_ && first.offset_ < second.offset_);
+        || (first.filePath_ == second.filePath_ && first.line_ < second.line_)
+        || (first.filePath_ == second.filePath_ && first.line_ == second.line_ && first.column_ < second.column_);
 }
 
 QDebug operator<<(QDebug debug, const SourceLocationContainer &container)
 {
     debug.nospace() << "SourceLocationContainer("
                     << container.filePath() << ", "
                     << container.line() << ", "
-                    << container.offset()
+                    << container.column()
                     << ")";
     return debug;
 }
@@ -112,7 +114,7 @@ void PrintTo(const SourceLocationContainer &container, ::std::ostream* os)
     *os << "["
         << container.filePath().constData() << ", "
         << container.line() << ", "
-        << container.offset()
+        << container.column()
         << "]";
 }
 } // namespace ClangBackEnd

diff --git a/src/libs/clangbackendipc/sourcelocationcontainer.h b/src/libs/clangbackendipc/sourcelocationcontainer.h
@@ -51,16 +51,16 @@ class CMBIPC_EXPORT SourceLocationContainer
     SourceLocationContainer() = default;
     SourceLocationContainer(const Utf8String &filePath,
                             uint line,
-                            uint offset);
+                            uint column);
 
     const Utf8String &filePath() const;
     uint line() const;
-    uint offset() const;
+    uint column() const;
 
 private:
     Utf8String filePath_;
     uint line_;
-    uint offset_;
+    uint column_;
 };
 
 CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const SourceLocationContainer &container);

diff --git a/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp b/src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp
@@ -513,14 +513,16 @@ static std::string commandLocals(ExtensionCommandContext &commandExtCtx,PCSTR ar
     if (watchSynchronization) {
         watchesSymbolGroup = 0;
         extCtx.discardWatchesSymbolGroup();
-        if (!watcherInameExpressionMap.empty()) {
-            // Force group into existence
-            watchesSymbolGroup = extCtx.watchesSymbolGroup(commandExtCtx.symbols(), errorMessage);
-            if (!watchesSymbolGroup || !watchesSymbolGroup->synchronize(commandExtCtx.symbols(),
-                                                                        watcherInameExpressionMap,
-                                                                        errorMessage)) {
-                return std::string();
-            }
+    }
+
+    if (watchesSymbolGroup == 0
+            && (!watcherInameExpressionMap.empty() || WatchesSymbolGroup::isWatchIname(iname))) {
+        // Force group into existence
+        watchesSymbolGroup = extCtx.watchesSymbolGroup(commandExtCtx.symbols(), errorMessage);
+        if (!watchesSymbolGroup || !watchesSymbolGroup->synchronize(commandExtCtx.symbols(),
+                                                                    watcherInameExpressionMap,
+                                                                    errorMessage)) {
+            return std::string();
         }
     }