Merge remote-tracking branch 'origin/2.8'

Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48

dist/changes-2.8.1

+
+Qt Creator version 2.8.1 is a bugfix release.
+
+The most important changes are listed in this document. For a complete
+list of changes, see the Git log for the Qt Creator sources that
+you can check out from the public Git repository. For example:
+
+git clone git://gitorious.org/qt-creator/qt-creator.git
+git log --cherry-pick --pretty=oneline v2.8.0..v2.8.1
+
+There is a total of about 123 changes by 28 individual contributors.
+
+Credits for these changes go to:
+
+Andreas Holzammer
+André Pönitz
+Aurindam Jana
+Christian Kandeler
+Christian Stenger
+Daniel Teske
+David Schulz
+Eike Ziller
+El Mehdi Fekar
+Fawzi Mohamed
+Jaroslaw Kobus
+Joerg Bornemann
+Leena Miettinen
+Lukas Holecek
+Michal Klocek
+Nikolai Kosjar
+Orgad Shaneh
+Oswald Buddenhagen
+Pavel Fric
+Petar Perisin
+Rainer Keller
+Robert Loehning
+Sergey Belyashov
+Sergio Martins
+Thomas Hartmann
+Tobias Hunger
+Venugopal Shivashankar
+Victor Ostashevsky
+
+
+
+General
+
+Editing
+   * Removed trailing whitespace in generated files (QTCREATORBUG-9833)
+   * Fixed placing cursor after replacing "." with "->" (QTCREATORBUG-9891)
+   * Fixed crash that occurred when opening non-splittable editors in split
+     windows (QTCREATORBUG-9843)
+   * Fixed issues with having same document open in multiple splits
+     (QTCREATORBUG-9801, QTCREATORBUG-9798)
+
+Managing Projects
+
+Compilers
+
+Devices
+   * Fixed device changes in kits
+
+QMake Projects
+   * Fixed tool chain use for cross-compilation
+   * Avoided deadlock during spec/cache loading
+
+CMake Projects
+
+Qbs Projects
+
+Autotools Projects
+
+Generic Projects
+
+Documentation
+   * Added tutorial for developing Android applications
+   * Updated documentation of Android Manifest editor
+   * Updated some debugger documentation
+
+Debugging
+   * Fixed dumpers in the presence of -D_GLIBCXX_DEBUG
+   * Fixed endless loop when stopping without winXXinterrupt.exe
+   * Added support for GDB builds with Python 3.x
+   * Added dumper for std::unordered_{set,map} (QTCREATORBUG-9855)
+   * Improved display performance of unnamed structures (QTCREATORBUG-9947)
+   * Made C++ debugging continue even if QML debugger fails (QTCREATORBUG-9836)
+   * Fixed remote QML debugging with port forwarding involved
+
+Analyzer
+   * Improved Android and QNX support
+
+C++ Support
+   * Fixed crash in typedef resolving (QTCREATORBUG-9990)
+   * Improved performance for generated symbols (QTCREATORBUG-9877)
+   * Added checking whether project has changed before reparsing
+     (QTCREATORBUG-9581)
+
+Python Support
+
+Diff Viewer
+
+Version Control Systems
+   * Disabled undo/redo for VCS output window (QTCREATORBUG-7645)
+   * Git
+      * Fixed crash on quit while rebase-todo editor is open
+      * Fixed double stash pop on branch checkout
+
+FakeVim
+
+Platform Specific
+
+Linux
+
+Qt Support
+
+QNX
+   * Fixed the SSH Key Setup dialog to display native separators in paths
+    (QTCREATORBUG-9830)
+
+Android
+   * Ensured that keytool returns English output (QTCREATORBUG-9941)
+
+Translations
+   * Updated Czech, Polish, Russian and Ukrainian translations
+
+Testing
+   * Added Squish tests for codepasting, external sort tool,
+     UI completion, and "Go to slot" in Qt Designer
+
+QML Designer
+   * Fixed support for layouts
+   * Fixed several issues in property editor
+   * Added support for global Qt enums in rewriter
+

doc/snippets/qml/tutorial_finalmainqml.qml

+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 2.1
+import QtQuick.Controls 1.0
+
+//! [sensorimport]
+import QtSensors 5.0
+//! [sensorimport]
+
+
+ApplicationWindow {
+    title: "Accelerate Bubble"
+    id: mainWindow
+    width: 320
+    height: 480
+    visible: true
+
+    Accelerometer {
+        id: accel
+        dataRate: 100
+        active:true
+
+
+//! [readingchanged]
+        onReadingChanged: {
+            var newX = (bubble.x + calcRoll(accel.reading.x, accel.reading.y, accel.reading.z) * 0.1)
+            var newY = (bubble.y - calcPitch(accel.reading.x, accel.reading.y, accel.reading.z) * 0.1)
+
+            if (newX < 0)
+                newX = 0
+
+            if (newX > mainWindow.width - bubble.width)
+                newX = mainWindow.width - bubble.width
+
+            if (newY < 18)
+                newY = 18
+
+            if (newY > mainWindow.height - bubble.height)
+                newY = mainWindow.height - bubble.height
+
+                bubble.x = newX
+                bubble.y = newY
+        }
+//! [readingchanged]
+    }
+
+//! [jsfunctions]
+    function calcPitch(x, y, z) {
+        return -(Math.atan(y / Math.sqrt(x * x + z * z)) * 57.2957795);
+    }
+    function calcRoll(x, y, z) {
+         return -(Math.atan(x / Math.sqrt(y * y + z * z)) * 57.2957795);
+    }
+//! [jsfunctions]
+
+    Image {
+        id: bubble
+        source: "Bluebubble.svg"
+        smooth: true
+        property real centerX: mainWindow.width / 2
+        property real centerY: mainWindow.height / 2;
+        property real bubbleCenter: bubble.width / 2
+        x: centerX - bubbleCenter
+        y: centerY - bubbleCenter
+
+//! [smoothedanim]
+        Behavior on y {
+            SmoothedAnimation {
+                easing.type: Easing.Linear
+                duration: 100
+            }
+        }
+        Behavior on x {
+            SmoothedAnimation {
+                easing.type: Easing.Linear
+                duration: 100
+            }
+        }
+//! [smoothedanim]
+   }
+}

doc/snippets/qml/tutorial_initialqml.qml

+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//! [initialcode]
+import QtQuick 2.0
+
+Rectangle {
+    width: 100
+    height: 62
+}
+//! [initialcode]

doc/snippets/qml/tutorial_updatedmainview.qml

+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//! [imports]
+import QtQuick 2.1
+import QtQuick.Controls 1.0
+//! [imports]
+
+ApplicationWindow {
+    title: "Accelerate Bubble"
+    id: mainWindow
+    width: 320
+    height: 480
+    visible: true
+
+    Image {
+        id: bubble
+        source: "Bluebubble.svg"
+        smooth: true
+        property real centerX: mainWindow.width / 2
+        property real centerY: mainWindow.height / 2
+        property real bubbleCenter: bubble.width / 2
+        x: centerX - bubbleCenter
+        y: centerY - bubbleCenter
+    }
+}

doc/snippets/tutorial_accelbubble.pro

+RESOURCES += \
+    accelbubble.qrc
+
+SOURCES += \
+    main.cpp
+
+QT += quick sensors svg xml

doc/snippets/tutorial_main.cpp

+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtGui/QGuiApplication>
+#include <QtQml/QQmlApplicationEngine>
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication app(argc, argv);
+    QQmlApplicationEngine engine(QUrl("qrc:///accelbubble.qml"));
+
+    return app.exec();
+}
+

doc/src/android/creator-projects-settings-run-android.qdocinc

-    To specify information for the Android manifest file, select \gui Projects >
+    To configure Android packages, select \gui Projects >
     \gui Run > \gui {Package configurations}. The Android system uses the
     information from the file to start application components.
 
-    \section2 Specifying Package Data
+    \image qtcreator-android-manifest.png "Package configuration"
 
-    In the \gui Manifest tab, you can select the API level to use for the
-    Android target SDK and the name and version number for the application
-    package.
+    \section2 Selecting API Level
 
-    \image qtcreator-android-manifest.png "Manifest tab"
+    In the \gui {Android target SDK} field, you can select the API level to use
+    for the Android target SDK.
 
     For more information about Android API levels, see
     \l{http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels}
@@ -21,43 +20,15 @@
     \note The android-4 API level does not support multitouch. If your
     application needs multitouch, select a higher API level.
 
-    In the \gui {Package name} field, enter a package name for the application.
-    The application is launched by an automatically generated Java launcher that
-    is packaged with the application into an Android package (.apk). For more
-    information, see
-    \l{http://developer.android.com/guide/components/fundamentals.html}
-    {Android Application Fundamentals}.
-
-    \section2 Specifying Application Data
-
-    In the \gui Application tab, you can select an icon for the application and
-    give the application a name.
-
-    \image qtcreator-android-application.png "Application tab"
-
-    \section2 Setting Permissions
-
-    In the \gui Permissions tab, you can specify the permissions that your
-    application needs. Users are asked to grant the permissions when they
-    install the application. Android OS then grants the application access to
-    the appropriate data and features.
-
-    \image qtcreator-android-permissions.png "Permissions tab"
-
-    Select from existing Android permissions or add new ones to deploy the
-    application to a particular Android OS.
-
     \section2 Selecting Qt Libraries
 
-    In the \gui Libraries tab, specify which Qt libraries the application uses.
+    In the \gui Libraries group, specify which Qt libraries the application uses.
     To automatically determine this, select \gui {Read Infomation from
     Application (Must Be Compiled)}. Alternatively, you can manually select the
     Qt libraries and the external libraries you think your application needs.
     Make sure to arrange the libraries so that depended libraries appear before
     the ones that depend on them.
 
-    \image qtcreator-android-libraries.png "Libraries tab"
-
     These entries are used by the Ministro tool to determine which Qt libraries
     to download.
 
@@ -66,8 +37,38 @@
 
     \section2 Signing Android Packages
 
-    In the \gui {Sign Package} tab, you can sign the Android package by using
+    In the \gui {Sign Package} group you can sign the Android package by using
     a private key from the keystore. To create new keys, select \gui Create.
 
-    \image qtcreator-android-sign-package.png "Sign Package tab"
+    \image qtcreator-android-sign-package.png "Sign Package"
+
+    \section1 Editing Manifest Files
+
+    To specify information for the Android manifest file, open it in \QC.
+
+    \image qtcreator-android-manifest-editor.png "Android Manifest Editor"
+
+    Select the \gui {XML Source} tab to edit the file in XML format.
+
+    In the \gui {Package name} field, enter a package name for the application.
+    The application is launched by an automatically generated Java launcher that
+    is packaged with the application into an Android package (.apk). For more
+    information, see
+    \l{http://developer.android.com/guide/components/fundamentals.html}
+    {Android Application Fundamentals}.
+
+    You can specify an internal version number for the package in the
+    \gui {Version code} field. It is used to determine whether one version of
+    the application is more recent than another. In the \gui {Version name}
+    field, specify the version number that is shown to users.
+
+    In the \gui Application group, you can give the application a name and
+    select an icon for it. The three icon fields can contain different versions
+    of the icon with low, medium, and high DPI values, from left to right.
+
+    In the \gui Permissions field, you can specify the permissions that your
+    application needs. Users are asked to grant the permissions when they
+    install the application. Android OS then grants the application access to
+    the appropriate data and features.
 
+    To add permissions, select \gui Add and select permissions from the list.

doc/src/debugger/qtquick-debugging.qdoc

@@ -125,13 +125,33 @@
 
     \list 1
 
-        \li Start the application.
+        \li Build the application by using the appropriate configuration
+            parameters (if you build the application with \QC, it automatically
+            uses the correct configuration):
+
+            \list
+
+                \li Qt Quick 1: \c {CONFIG+=declarative_debug}
+
+                \li Qt Quick 2: \c {CONFIG+=qml_debug}
+
+            \endlist
+
+        \li Start the application with the following arguments:
+
+            \c {qmljsdebugger=port:<port>[,host:<ip address>][,block]}
+
+            Where \c port (mandatory) specifies the debugging port,
+            \c {ip address} (optional) specifies the IP address of the host
+            where the application is running, and \c block (optional) prevents
+            the application from running until the debug client connects to the
+            server. This enables debugging from the start.
 
         \li Select \gui {Debug > Start Debugging > Attach to QML Port}.
 
-            When debugging on the desktop, you can use the default values for
-            the connection. When debugging on devices, enter the device IP
-            address in the \gui Host field.
+            Choose the kit configured for the device where the application to
+            be debugged is running. The port number to use is displayed in the
+            standard output when the application starts.
 
     \endlist
 

doc/src/overview/creator-tutorials.qdoc

@@ -46,6 +46,11 @@
 
             Learn how to create a Qt widget based application for the desktop.
 
+       \li \l{Creating an Android Application}
+
+            Learn how to create a Qt Quick application using Qt Quick Controls
+            for Android devices.
+
     \endlist
 
 */

doc/src/projects/creator-projects-overview.qdoc

@@ -24,7 +24,7 @@
 
 /*!
     \contentspage index.html
-    \previouspage creator-writing-program.html
+    \previouspage creator-android-app-tutorial.html
     \page creator-project-managing.html
     \nextpage creator-project-creating.html
 

doc/src/qtcreator.qdoc

@@ -154,6 +154,7 @@
             \list
                 \li \l{Creating a Qt Quick Application}
                 \li \l{Creating a Qt Widget Based Application}
+                \li \l{Creating an Android Application}
             \endlist
         \endlist
         \li \l{Managing Projects}