Merge remote-tracking branch 'origin/3.6'

Change-Id: I68512c775ed25b51c8b0abe1818c9c7c5955874c
openmv · Oct 30, 2015 · 310ae09 · 310ae09
2 parents e60f62c + 9fc4396
commit 310ae09
Show file tree

Hide file tree

Showing 95 changed files with 1,695 additions and 859 deletions.
diff --git a/dist/changes-3.5.0.md b/dist/changes-3.5.0.md
@@ -193,55 +193,55 @@ BareMetal
 
 * Fixed processing of additional OpenOCD arguments
 
-Credits for these changes go to:
-Alessandro Portale
-André Pönitz
-Alexander Drozdov
-Alexander Izmailov
-Arnold Dumas
-Benjamin Zeller
-BogDan Vatra
-Christian Kandeler
-Christian Stenger
-Cristian Adam
-Daniel Teske
-David Schulz
-Denis Kormalev
-Eike Ziller
-Erik Verbruggen
-Finn Brudal
-Friedemann Kleint
-Hugues Delorme
-Jack Andersen
-Jarek Kobus
-Jochen Becher
-Jörg Bornemann
-Johannes Lorenz
-Kai Köhne
-Knut Petter Svendsen
-Kudryavtsev Alexander
-Leena Miettinen
-Libor Tomsik
-Lorenz Haas
-Lukas Holecek
-Marcel Krems
-Marco Benelli
-Marco Bubke
-Montel Laurent
-Nikita Baryshnikov
-Nikita Kniazev
-Nikolai Kosjar
-Olivier Goffart
-Orgad Shaneh
-Ray Donnelly
-Robert Löhning
-Stanislav Ionascu
-Sune Vuorela
-Takumi ASAKI
-Tasuku Suzuki
-Thiago Macieira
-Thomas Hartmann
-Thorben Kroeger
-Tim Jenssen
-Tobias Hunger
-Ulf Hermann
+Credits for these changes go to:  
+Alessandro Portale  
+André Pönitz  
+Alexander Drozdov  
+Alexander Izmailov  
+Arnold Dumas  
+Benjamin Zeller  
+BogDan Vatra  
+Christian Kandeler  
+Christian Stenger  
+Cristian Adam  
+Daniel Teske  
+David Schulz  
+Denis Kormalev  
+Eike Ziller  
+Erik Verbruggen  
+Finn Brudal  
+Friedemann Kleint  
+Hugues Delorme  
+Jack Andersen  
+Jarek Kobus  
+Jochen Becher  
+Jörg Bornemann  
+Johannes Lorenz  
+Kai Köhne  
+Knut Petter Svendsen  
+Kudryavtsev Alexander  
+Leena Miettinen  
+Libor Tomsik  
+Lorenz Haas  
+Lukas Holecek  
+Marcel Krems  
+Marco Benelli  
+Marco Bubke  
+Montel Laurent  
+Nikita Baryshnikov  
+Nikita Kniazev  
+Nikolai Kosjar  
+Olivier Goffart  
+Orgad Shaneh  
+Ray Donnelly  
+Robert Löhning  
+Stanislav Ionascu  
+Sune Vuorela  
+Takumi ASAKI  
+Tasuku Suzuki  
+Thiago Macieira  
+Thomas Hartmann  
+Thorben Kroeger  
+Tim Jenssen  
+Tobias Hunger  
+Ulf Hermann  
diff --git a/dist/changes-3.6.0.md b/dist/changes-3.6.0.md
@@ -51,7 +51,7 @@ C++ Support
 
 * Added support for `noexcept`
 * Clang code model
-    * Added diagnostic messages to editors
+    * Added more diagnostic messages to editors
     * Added Clang's Fix-its to refactoring actions (QTCREATORBUG-14868)
 
 Debugging
@@ -125,3 +125,46 @@ Remote Linux
   ECDSA user keys, and ECDSA key creation
 * Fixed environment and working directory for Valgrind analyzer
 
+Credits for these changes go to:  
+Aleix Pol  
+Alessandro Portale  
+Alexander Drozdov  
+Andre Hartmann  
+André Pönitz  
+Benjamin Zeller  
+BogDan Vatra  
+Christian Kandeler  
+Christian Stenger  
+Christian Strømme  
+Claus Steuer  
+Cristian Adam  
+Daniel Teske  
+David Schulz  
+Eike Ziller  
+Jake Petroules  
+Jakub Golebiewski  
+Jan Dalheimer  
+Jarek Kobus  
+Jean Gressmann  
+Jochen Becher  
+Leena Miettinen  
+Lorenz Haas  
+Marco Bubke  
+Maurice Kalinowski  
+Mitch Curtis  
+Montel Laurent  
+Niels Weber  
+Nikita Baryshnikov  
+Nikolai Kosjar  
+Oliver Wolff  
+Orgad Shaneh  
+Oswald Buddenhagen  
+Robert Loehning  
+Sze Howe Koh  
+Thiago Macieira  
+Thomas Hartmann  
+Thorbjørn Lindeijer  
+Tim Jenssen  
+Tobias Hunger  
+Ulf Hermann  
+Vladyslav Gapchych  
diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf
@@ -23,6 +23,7 @@ indexes +=    $QDOC_INDEX_DIR/qtwidgets/qtwidgets.index \
               $QDOC_INDEX_DIR/qtgui/qtgui.index \
               $QDOC_INDEX_DIR/qthelp/qthelp.index \
               $QDOC_INDEX_DIR/qtquickcontrols/qtquickcontrols.index \
+              $QDOC_INDEX_DIR/qtquickextras/qtquickextras.index \
               $QDOC_INDEX_DIR/qtquicklayouts/qtquicklayouts.index \
               $QDOC_INDEX_DIR/qtlinguist/qtlinguist.index \
               $QDOC_INDEX_DIR/qtscript/qtscript.index \

diff --git a/doc/images/qtcreator-iso-icon-browser.png b/doc/images/qtcreator-iso-icon-browser.png
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc
@@ -1699,6 +1699,13 @@
     You can also press \key {Alt+Enter} to open a context menu that contains
     refactoring actions available in the current cursor position.
 
+    If you use the \l{Parsing C++ Files}{Clang code model} to parse the C++
+    files, the \l{http://clang.llvm.org/diagnostics.html}{Clang fix-it hints}
+    that have been integrated into \QC are also available to you. In addition to
+    the standard ways of activating refactoring actions, you can select the
+    actions that are applicable on a line in the context menu in the left margin
+    of the code editor.
+
    \section2 Refactoring C++ Code
 
    You can apply the following types of refactoring actions to C++ code:
@@ -2312,6 +2319,8 @@
             \li QObject::connect() (Qt 4 style)
     \endtable
 
+
+
     \section2 Refactoring QML Code
 
     You can apply the following types of refactoring actions to QML code:

diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc
@@ -185,6 +185,7 @@
                 \li \l {Creating Buttons}
                 \li \l {Creating Scalable Buttons and Borders}
                 \li \l {Creating Screens}
+                \li \l {Browsing ISO 7000 Icons}
                 \li \l {Exporting Designs from Graphics Software}
                 \li \l {Using QML Modules with Plugins}
             \endlist

diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/qtquick-app-development.qdoc
@@ -69,6 +69,11 @@
             Dialogs, and Layouts (available since Qt 5.1) to create screens. You
             can use states and transitions to navigate between screens.
 
+        \li \l {Browsing ISO 7000 Icons}
+
+            You can add ISO 7000 icons from a library delivered with \QC to Qt
+            Quick applications and change their color (commercial only).
+
         \li \l {Exporting Designs from Graphics Software}
 
             You can export designs from graphics software, such as Adobe

diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc
@@ -77,6 +77,9 @@
     creating classic desktop-style user interfaces using Qt Quick 2.1. You can
     use the Qt Quick Controls Styles to customize Qt Quick Controls.
 
+    Some ready-made controls, such as a gauge, dial, status indicator, and
+    tumbler, are provided by the \l {Qt Quick Extras} module.
+
     The \QC project wizards create Qt Quick applications that use Qt Quick
     Components or Controls.
 

diff --git a/doc/src/qtquick/qtquick-exporting-qml.qdoc b/doc/src/qtquick/qtquick-exporting-qml.qdoc
@@ -25,7 +25,7 @@
 /*!
 
     \contentspage {Qt Creator Manual}
-    \previouspage qmldesigner-connections.html
+    \previouspage qtquick-iso-icon-browser.html
     \page quick-export-to-qml.html
     \nextpage creator-qml-modules-with-plugins.html
 

diff --git a/doc/src/qtquick/qtquick-iso-icon-browser.qdoc b/doc/src/qtquick/qtquick-iso-icon-browser.qdoc
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company.  For licensing terms and
+** conditions see http://www.qt.io/terms-conditions.  For further information
+** use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, The Qt Company gives you certain additional
+** rights.  These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+/*!
+    \contentspage {Qt Creator Manual}
+    \previouspage quick-screens.html
+    \page qtquick-iso-icon-browser.html
+    \nextpage quick-export-to-qml.html
+
+    \title Browsing ISO 7000 Icons
+
+    \commercial
+
+    You can add icons from an ISO 7000 icon library that is installed with \QC
+    to Qt Quick applications (commercial only). You can use the
+    \uicontrol {ISO Icon Browser} to add a \l {Picture} type and select the
+    icon to use for the type. You can change the default color of the icon.
+
+    \image qtcreator-iso-icon-browser.png
+
+    \section1 Using ISO Icons in Applications
+
+    \list 1
+
+        \li Create a new Qt Quick Application or open an application in \QC.
+
+        \li Open the Qt Quick UI form in the \uicontrol Design mode.
+
+        \li In the \uicontrol Library, select \uicontrol Imports >
+            \uicontrol {Add Import} > \uicontrol {QtQuick.Extras} to import the
+            \l {Qt Quick Extras} module.
+
+        \li Drag and drop a \uicontrol Picture element from the library to the
+            canvas.
+
+        \li Right-click the picture element and select \uicontrol {Choose Icon}
+            to open the \uicontrol {ISO Icon Browser}.
+
+        \li To find icons, select a criterion for filtering icons and enter a
+            search string.
+
+        \li Select an icon in the list, and then select \uicontrol OK to add
+            the icon.
+
+        \li To view the icon you added, press \key {Ctrl+R} (or \key {Cmd+R})
+            to run the application.
+
+        \li To adjust the icon color, select the icon on the canvas, and then
+            select \uicontrol {Edit Color} in the context menu.
+
+    \endlist
+
+    \QC generates a Qt resource file called \c iso-icons.qrc that adds the
+    icons as a part of your project for delivery with your application.
+
+    */
diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc
@@ -27,7 +27,7 @@
     \contentspage {Qt Creator Manual}
     \previouspage quick-scalable-image.html
     \page quick-screens.html
-    \nextpage creator-qtquick-designer-extensions.html
+    \nextpage qtquick-iso-icon-browser.html
 
     \title Creating Screens
 

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

diff --git a/qtcreator.qbs b/qtcreator.qbs
@@ -6,11 +6,11 @@ Project {
     property bool withAutotests: qbs.buildVariant === "debug"
     property string ide_version_major: '3'
     property string ide_version_minor: '5'
-    property string ide_version_release: '81'
+    property string ide_version_release: '82'
     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: '81'
+    property string ide_compat_version_release: '82'
     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/qttypes.py b/share/qtcreator/debugger/qttypes.py
@@ -1269,7 +1269,7 @@ def _qdump__QObject(d, value):
                             d.putField("keyencoded", Hex2EncodedLatin1)
                             qq = q.cast(valuesType.pointer().pointer())
                             qq = qq.dereference();
-                            d.putField("addr", d.cleanAddress(qq))
+                            d.putField("address", d.cleanAddress(qq))
                             d.putField("exp", "*(%s*)%s"
                                  % (variant, d.cleanAddress(qq)))
                             t = qdump__QVariant(d, qq)

diff --git a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickapplication/wizard.json
@@ -98,12 +98,12 @@
                     "openAsProject": true
                 },
                 {
-                    "source": "../../qmake/qtquickapplication/main.qml",
+                    "source": "../../qmake/qtquickapplication/main.qml.tpl",
                     "target": "%{ProjectDirectory}/%{MainQmlFileName}",
                     "openInEditor": true
                 },
                 {
-                    "source": "../../qmake/qtquickapplication/MainForm.ui.qml",
+                    "source": "../../qmake/qtquickapplication/MainForm.ui.qml.tpl",
                     "target": "%{ProjectDirectory}/MainForm.ui.qml",
                     "condition": "%{IsUiFileInUse}"
                 },

diff --git a/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmlproject/qtquickcontrolsapplication/wizard.json
@@ -106,12 +106,12 @@
                     "openAsProject": true
                 },
                 {
-                    "source": "../../qmake/qtquickcontrolsapplication/main.qml",
+                    "source": "../../qmake/qtquickcontrolsapplication/main.qml.tpl",
                     "target": "%{ProjectDirectory}/%{MainQmlFileName}",
                     "openInEditor": true
                 },
                 {
-                    "source": "../../qmake/qtquickcontrolsapplication/MainForm.ui.qml",
+                    "source": "../../qmake/qtquickcontrolsapplication/MainForm.ui.qml.tpl",
                     "target": "%{ProjectDirectory}/MainForm.ui.qml",
                     "condition": "%{IsUiFileInUse}"
                 },