Merge remote-tracking branch 'origin/2.6'

Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5

dist/changes-2.6.0

@@ -22,10 +22,12 @@ Editing
    * Added shortcuts for searching for next and previous occurrence
      of selected text without opening the find tool bar (QTCREATORBUG-464)
    * Made resource files searchable (Ctrl+F)
+   * Integrated VCS support into the resource editor
    * Added file type icons to the resource editor
    * Added opening of files from the resource editor
+   * Added renaming of files from the resource editor
    * Added highlighting of missing files in the resource editor
-   * Added support for movies in the image viewer
+   * Added support for animated images in the image viewer
    * Fixed problems when closing documents in a split view (QTCREATORBUG-7361)
 
 Managing Projects

doc/src/analyze/creator-valgrind.qdoc

@@ -45,7 +45,7 @@
 
     \list 1
 
-        \o  In the \gui Projects mode, select a release build configuration.
+        \o  In the \gui Projects mode, select a debug build configuration.
 
         \o  Select \gui Analyze to open the \gui Analyze mode.
 
@@ -166,12 +166,13 @@
     the \gui Callers view and about the called functions in the \gui Callees
     view.
 
-    Since Debug and Release mode run-time characteristics differ
-    significantly, analytical findings for one mode may or not be
-    relevant for the other. Profiling a Debug mode build
+    Since the run-time characteristics of debug and release
+    \l{glossary-build-config}{build configurations}
+    differ significantly, analytical findings for one build configuration may or
+    not be relevant for the other. Profiling a debug build
     often finds a major part of the time being spent in low-level
     code like container implementations, while the same code
-    does not show up in the profile of a Release build of the
+    does not show up in the profile of a release build of the
     same application due to inlining and other optimizations
     typically done there.
 

doc/src/debugger/qtquick-debugging.qdoc

@@ -89,7 +89,7 @@
 
         \o  To debug applications on devices, check that Qt 4.7.4, or later,
             libraries are installed on the device and
-            \l{Running on Multiple Targets}{select the corresponding kit for the device}
+            \l{Running on Multiple Platforms}{select the corresponding kit for the device}
             before you start debugging.
 
     \endlist

doc/src/howto/creator-ui.qdoc

@@ -326,6 +326,9 @@
 
     \image qtcreator-application-output.png
 
+    Select toolbar buttons to run applications, to attach the debugger to the
+    running application, and to stop running or debugging.
+
     \section2 Compile Output
 
     The \gui{Compile Output} pane provides all output from the compiler.
@@ -334,6 +337,11 @@
 
     \image qtcreator-compile-pane.png
 
+    Double-click on a file name in an error message to open the file in the
+    code editor.
+
+    Select the \gui {Cancel Build} button to cancel the build.
+
     \section2 To-Do List
 
     The \gui {To-Do List Entries} pane lists the BUG, FIXME, NOTE, TODO, and
@@ -383,6 +391,8 @@
 
         \o  Return to original size
 
+        \o  Play and pause movies
+
     \endlist
 
     \section1 Navigating with Keyboard

doc/src/linux-mobile/linuxdev.qdoc

@@ -36,7 +36,7 @@
     build and run applications on embedded Linux devices.
 
     To be able to run and debug applications on embedded Linux devices, you must
-    create device configurations and select them in the \QC \l{glossary-buildandrun-kit}{kit}
+    add devices and select them in the \QC \l{glossary-buildandrun-kit}{kit}.
 
     You use a wizard to create the connections. You can edit the settings later
     in \gui Tools > \gui Options > \gui Devices.

doc/src/linux-mobile/maemodev.qdoc

@@ -224,7 +224,7 @@
     You use a wizard to create the connections. You can edit the settings later
     in \gui Tools > \gui Options > \gui Devices.
 
-    \image qtcreator-maemo-device-configurations.png "Maemo Device Configurations dialog"
+    \image qtcreator-maemo-device-configurations.png "Devices dialog"
 
     By default, you create the connection as the \e developer user. This
     protects real user data on the device from getting corrupted during
@@ -286,7 +286,7 @@
 
             \o  Select \gui {Maemo5/Fremantle} > \gui {Start Wizard}.
 
-            \image qtcreator-dev-conf-maemo.png "Maemo device configuration"
+            \image qtcreator-dev-conf-maemo.png "Maemo device"
 
             \o In the \gui {The name to identify this configuration} field,
             enter a name for the connection.

doc/src/linux-mobile/meegodev.qdoc

@@ -237,7 +237,7 @@
     You use a wizard to create the connections. You can edit the settings later
     in \gui Tools > \gui Options > \gui Devices.
 
-    \image qtcreator-meego-device-configurations.png "MeeGo Device Configurations dialog"
+    \image qtcreator-meego-device-configurations.png "Devices dialog"
 
     By default, you create the connection as the \e developer user. This
     protects real user data on the device from getting corrupted during testing.

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

@@ -53,9 +53,9 @@
             Maemo 5/Fremantle devices.
         \o \l{Deploying Applications to QNX Devices}
 
-            When you deploy the application on a QNX device, depending
-            on your target device, \QC either generates a BAR package in the
-            build directory and deploys it to the connected device, or copies
+            When you deploy the application on a BlackBerry, \QC  generates a
+            BAR package in the build directory and deploys it to the connected
+            device. When you deploy it on a QNX Neutrino device, \QC copies
             the application files to the connected device. You can test and
             debug the application on the device.
     \endlist
@@ -67,8 +67,7 @@
 
             When you are ready to publish the application on a publishing
             channel, you must make sure that the installation file meets the
-            requirements for publishing and installing applications to the
-            targeted devices.
+            requirements for publishing on the channel.
     \endlist
 
 */

doc/src/overview/creator-glossary.qdoc

@@ -103,7 +103,8 @@
             \o  Project
                 \target glossary-project
             \o  Groups together a set of source files, forms, and resource files
-                that you can build, deploy, and run for different \e targets, as
+                that you can build, deploy, and run for different desktop and
+                mobile device platforms, as
                 specified by a \e {build configuration}, \e {deploy
                 configuration}, and \e {run configuration}.
 

doc/src/overview/creator-mobile-targets.qdoc

@@ -29,14 +29,13 @@
     \page creator-connecting-mobile.html
     \nextpage creator-developing-android.html
 
-    \title Connecting Mobile Targets
+    \title Connecting Mobile Devices
 
     You can connect mobile devices to the development PC to build, run, debug,
-    and analyze applications on them from \QC. When you install
-    \l{glossary-buildandrun-kit}{kits} for building and running on mobile targets
-    as part of the \QSDK, the build and run settings for the target devices are
-    set up automatically in \QC. However, \QSDK does not contain a tool chain
-    for building applications for embedded Linux devices.
+    and analyze applications on them from \QC. When you install an SDK for a
+    target platform, such as Android or QNX, the build and run settings for the
+    development targets delivered with the SDK might be set up automatically in
+    \QC.
 
     You can connect the device to the development PC using a USB connection.
     Additionally, you can connect Linux-based devices by using a WLAN
@@ -57,8 +56,7 @@
 
             If you have a tool chain for building applications for embedded
             Linux devices (with no MADDE support) installed on the development
-            PC, you can add it to \QC. Create device configurations and select
-            them in the \QC run settings.
+            PC, you can add it and the device to \QC.
 
         \o  \l{Connecting Maemo Devices}
 

doc/src/overview/creator-overview.qdoc

@@ -90,7 +90,7 @@
                 applications for desktop environment and mobile devices.
                 \l{glossary-buildandrun-kit}{Kits}, build,
                 run, and deployment settings allow you to quickly switch between
-                different setups and targets.
+                different setups and target platforms.
 
                 For more information, see \l{Building and Running}.
             \o  \bold {\l{Debugging and Analyzing}}

doc/src/projects/creator-projects-build-run-tutorial.qdoc

@@ -65,7 +65,7 @@
         \o  To test the application in \QS, click the \gui {Kit
             Selector} and select \gui {\QS}.
 
-            \image qtcreator-gs-build-example-select-qs.png "Selecting Qt Simulator as target device type"
+            \image qtcreator-gs-build-example-select-qs.png "Selecting Qt Simulator to run on"
 
         \o  Click
             \inlineimage qtcreator-run.png
@@ -82,7 +82,7 @@
 
         \o  Change the settings in the \gui Model view. For example, rotate the
             device by clicking the \gui {Orientation} buttons or choose from the
-            various mobile device configurations in the \gui {Device} field. You
+            various mobile devices in the \gui {Device} field. You
             can also simulate various mobile functions and create your own
             scripts.
 

doc/src/projects/creator-projects-building-running.qdoc

@@ -34,23 +34,24 @@
     \image creator_buildingrunning.png
 
     \QC provides support for building, running, and deploying Qt applications
-    for different targets, or using different compilers, debuggers or Qt versions.
+    for different target platforms, or using different compilers, debuggers, or
+    Qt versions.
     \l{glossary-buildandrun-kit}{Kits} define the tools,
     device type and other settings to use when building and running your project.
 
     \list
-        \o  \l{Building for Multiple Targets}
+        \o  \l{Building for Multiple Platforms}
 
             \e {Build configurations} contain everything you need to compile
             the sources into binaries. Build configurations use the tools and settings
             defined in their corresponding \l{glossary-buildandrun-kit}{kit}.
 
-        \o  \l{Running on Multiple Targets}
+        \o  \l{Running on Multiple Platforms}
 
             \e {Run configurations} start the application in the location
             where it was copied by the \e{deploy configuration}. By default,
             when you select the \gui Run function, \QC builds the project,
-            deploys it to the target defined in the \l{glossary-buildandrun-kit}{kit},
+            deploys it to the device defined in the \l{glossary-buildandrun-kit}{kit},
             and runs it there. However,
             if you have not made any changes to the project since you last
             built and deployed it, \QC simply runs it again.
@@ -62,10 +63,10 @@
             at. The files can be copied to a location in the file system of
             the development PC or a mobile device.
 
-        \o  \l{Connecting Mobile Targets}
+        \o  \l{Connecting Mobile Devices}
 
-            When you install tool chains for device types as part of the \QSDK,
-            the build and run settings for mobile device types are set up
+            When you install tool chains for device types as part of an SDK,
+            the build and run settings for mobile device types might be set up
             automatically. However, you might need to install and configure some
             additional software on the devices to be able to connect to them
             from the development PC.
@@ -79,7 +80,7 @@
         \o  \l{Customizing the Build Process}
 
             By default, running an application also builds it and deploys it to
-            a location from where it can be run on the target device. You can change
+            a location from where it can be run on the device. You can change
             the relationship between the build, run, and deploy configurations.
 
         \o  \l{http://doc.qt.nokia.com/qtsimulator/index.html}

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

@@ -29,9 +29,10 @@
     \page creator-building-targets.html
     \nextpage creator-running-targets.html
 
-    \title Building for Multiple Targets
+    \title Building for Multiple Platforms
 
-    You can build applications for multiple targets, or using different compilers,
+    You can build applications for multiple target platforms, or using different
+    compilers,
     debuggers or Qt versions. \l{glossary-buildandrun-kit}{Kits} define the tools,
     device type and other settings to use.
 
@@ -59,4 +60,8 @@
     For more information on the options you have, see
     \l{Specifying Build Settings}.
 
+    To quickly check the compile output for changes that you made in one file or
+    subproject, you can use the \gui Build menu commands to build a file or
+    subproject.
+
 */

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

@@ -238,7 +238,7 @@
     for building and running projects, select \gui{Tools} > \gui{Options} >
     \gui{Build & Run} > \gui{General}.
 
-    To specify build and run settings for different target platforms    ,
+    To specify build and run settings for different target platforms,
     select \gui Projects.
 
     \section1 Adding Files to Projects
@@ -282,7 +282,15 @@
 
         \o  General
 
-            Text files
+        \list
+
+            \o  Text files
+
+            \o  Scratch buffers that use temporary files. You can create this
+                type of files for temporarily storing information that you do
+                not intend to save
+
+        \endlist
 
     \endlist
 

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

@@ -29,7 +29,7 @@
     \page creator-running-targets.html
     \nextpage creator-deployment.html
 
-    \title Running on Multiple Targets
+    \title Running on Multiple Platforms
 
     By default, running an application also builds it and deploys it to a
     location from where it can be run on the desktop, in \QS, or

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

@@ -31,20 +31,20 @@
 
     \title Configuring Projects
 
-    \omit
-    When you install the \QSDK, the build and run settings for the development
-    targets delivered with the \QSDK are set up automatically.
-    \endomit
+    When you install an SDK for a target platform, such as Android or QNX, the
+    build and run settings for the development
+    targets delivered with the SDK might be set up automatically in \QC.
 
     To view and modify the settings for currently open projects, switch to the
     \gui Projects mode by pressing \key Ctrl+5.
 
     \image qtcreator-project-targets.png
 
-    To add build and run \l{glossary-buildandrun-kit}{kits} for the project, select \gui Add. The list
+    To add build and run \l{glossary-buildandrun-kit}{kits} for the project,
+    select \gui {Add Kit}. The list
     displays kits that are configured in \gui Tools > \gui Options >
     \gui {Build & Run} > \gui Kits. To add kits to the list, select
-    \gui Manage.
+    \gui {Manage Kits}.
 
     To remove a kit, hover the cursor over it (1) and click
     \inlineimage qtcreator-target-remove.png "Remove Kit button"

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

@@ -68,10 +68,7 @@
 
         \o  In the \gui Name column, double-click the kit name to change it.
 
-
-
-        \o  In the \gui{Device type} field, select the type of the device to
-            target.
+        \o  In the \gui{Device type} field, select the type of the device.
 
             Double-click the icon next to the field to select the image that is
             displayed in the kit selector for this kit. You can use any
@@ -80,7 +77,7 @@
             logo as an icon allows you to easily see, which compiler is used to
             build the project for the selected kit.
 
-        \o  In the \gui Device field, select the device configuration to target.
+        \o  In the \gui Device field, select a device.
 
         \o  In the \gui Sysroot field, specify the directory where the device
             image is located. If you are not cross-compiling, leave this field

doc/src/qnx/creator-deployment-qnx.qdoc

@@ -32,13 +32,11 @@
 
     \title Deploying Applications to QNX Devices
 
-    When you deploy the application on the \gui{QNX} target, depending on your
-    target device, \QC either generates a BAR package and installs it on the
-    connected device, or copies the application files to the device.
+    You can deploy applications to BlackBerry and QNX Neutrino devices.
 
     \section1 Deploying to BlackBerry Devices
 
-    For \gui{BlackBerry} targets, \QC generates a BAR package in the build
+    For BlackBerry devices, \QC generates a BAR package in the build
     directory and installs it on the connected device. The contents of the BAR
     package are specified in the \gui{Application Descriptor File}.
 
@@ -64,7 +62,7 @@
 
     \section1 Deploying to QNX Neutrino Devices
 
-    Deploying applications to a \gui{QNX Neutrino} device is very similar to
+    Deploying applications to a QNX Neutrino device is very similar to
     \l{Deploying Applications to Linux-Based Devices}.
 
     \image qtcreator-qnx-deployment.png "Deploy to device"

doc/src/qnx/creator-developing-qnx.qdoc

@@ -80,9 +80,8 @@
     \section1 Adding a BlackBerry Device in \QC
 
     Adding a BlackBerry device is done using a wizard in the \gui{Device
-    Configurations} options. To launch it, go to \gui{Tools > Options >
-    Linux Devices > Device Configurations > Add... > BlackBerry Device > Start
-    Wizard}.
+    Configurations} options. To launch it, go to \gui Tools > \gui Options >
+    \gui Devices > \gui Add > \gui {BlackBerry Device} > \gui {Start Wizard}.
 
     \image qtcreator-qnx-device-configurations-wizard-1.png "Connection details"
 
@@ -109,10 +108,10 @@
     Click \gui{Next} and then \gui{Finish} to complete setting up the device
     connection.
 
-    Once the device is added, you can edit the settings directly in the
-    \gui{Device Configurations} options page.
+    Once the device is added, you can edit the settings directly in \gui Tools >
+    \gui Options > \gui Devices.
 
-    \image qtcreator-qnx-device-configurations.png "Device Configurations"
+    \image qtcreator-qnx-device-configurations.png "Devices"
 
     \section1 Adding a QNX Neutrino Device in \QC
 

doc/src/qtcreator.qdoc

@@ -86,10 +86,10 @@
             \o  \list
             \o  \bold {\l{Building and Running}}
                 \list
-                    \o  \l{Building for Multiple Targets}
-                    \o  \l{Running on Multiple Targets}
+                    \o  \l{Building for Multiple Platforms}
+                    \o  \l{Running on Multiple Platforms}
                     \o  \l{Deploying to Mobile Devices}
-                    \o  \l{Connecting Mobile Targets}
+                    \o  \l{Connecting Mobile Devices}
                 \endlist
             \endlist
             \o  \list
@@ -231,15 +231,15 @@
         \endlist
         \o  \l{Building and Running}
         \list
-            \o  \l{Building for Multiple Targets}
-            \o  \l{Running on Multiple Targets}
+            \o  \l{Building for Multiple Platforms}
+            \o  \l{Running on Multiple Platforms}
             \o  \l{Deploying to Mobile Devices}
             \list
                 \o  \l{Deploying Applications to Android Devices}
                 \o  \l{Deploying Applications to Linux-Based Devices}
                 \o  \l{Deploying Applications to QNX Devices}
             \endlist
-            \o  \l{Connecting Mobile Targets}
+            \o  \l{Connecting Mobile Devices}
             \list
                 \o  \l{Connecting Android Devices}
                 \o  \l{Connecting Embedded Linux Devices}

doc/src/qtquick/qtquick-creating.qdoc

@@ -184,7 +184,7 @@
             \image qmldesigner-new-project-harmattan-options.png "Harmattan Specific dialog"
 
         \o  In the \gui {Application icon} field, select the application
-            icon to use on Maemo or Harmattan targets, or use the default icon.
+            icon to use on Maemo or Harmattan devices, or use the default icon.
 
             The \gui {Project Management} dialog opens.
 

qbs/defaults.js

@@ -5,7 +5,10 @@ function testsEnabled(qbs)
 
 function defines(qbs)
 {
-    var list = [ 'IDE_LIBRARY_BASENAME="lib"' ]
+    var list = [
+        'IDE_LIBRARY_BASENAME="lib"',
+        "QT_DISABLE_DEPRECATED_BEFORE=0x040900"
+    ]
     if (testsEnabled(qbs))
         list.push("WITH_TESTS")
     return list

src/libs/3rdparty/botan/botan.qbs

@@ -44,7 +44,7 @@ QtcLibrary {
                 "BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK", "BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE",
                 "BOTAN_HAS_DYNAMIC_LOADER", "BOTAN_HAS_ENTROPY_SRC_CAPI",
                 "BOTAN_HAS_ENTROPY_SRC_WIN32", "BOTAN_HAS_MUTEX_WIN32")
-        return result
+        return base.concat(result)
     }
 
     Properties {

src/libs/aggregation/aggregation.qbs

@@ -8,9 +8,6 @@ QtcLibrary {
         ".",
         ".."
     ]
-    cpp.defines: [
-        "AGGREGATION_LIBRARY"
-    ]
 
     Depends { name: "cpp" }
     Depends { name: "Qt.core" }

src/libs/cplusplus/cplusplus.qbs

@@ -10,10 +10,10 @@ QtcLibrary {
         "../3rdparty/cplusplus",
         "../../plugins"
     ]
-    cpp.defines: [
+    cpp.defines: base.concat([
         "NDEBUG",
         "CPLUSPLUS_BUILD_LIB"
-    ]
+    ])
     cpp.optimization: "fast"
 
     Depends { name: "cpp" }

src/libs/cplusplus/pp-engine.cpp

@@ -1297,6 +1297,8 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source,
     removeTrailingOutputLines();
 
     delete m_state.m_lexer;
+    while (m_state.m_tokenBuffer)
+        m_state.popTokenBuffer();
     m_state = savedState;
 
     m_env->currentFile = previousFileName;

src/libs/glsl/glsl.qbs

@@ -8,10 +8,10 @@ QtcLibrary {
         ".",
         ".."
     ]
-    cpp.defines: [
+    cpp.defines: base.concat([
         "QT_CREATOR",
         "GLSL_BUILD_LIB"
-    ]
+    ])
 
     Depends { name: "cpp" }
     Depends { name: "Qt.gui" }

src/libs/languageutils/languageutils.qbs

@@ -9,10 +9,10 @@ QtcLibrary {
         "..",
         "../3rdparty/cplusplus"
     ]
-    cpp.defines: [
+    cpp.defines: base.concat([
         "QT_CREATOR",
         "LANGUAGEUTILS_BUILD_DIR"
-    ]
+    ])
     cpp.optimization: "fast"
 
     Depends { name: "cpp" }

src/libs/qmldebug/qmldebug.qbs

@@ -8,9 +8,9 @@ QtcLibrary {
         ".",
         ".."
     ]
-    cpp.defines: [
+    cpp.defines: base.concat([
         "QMLDEBUG_LIB"
-    ]
+    ])
 
     Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["gui", "network"] }

src/libs/qmleditorwidgets/qmleditorwidgets.qbs

@@ -9,11 +9,11 @@ QtcLibrary {
         "..",
         "easingpane"
     ]
-    cpp.defines: [
+    cpp.defines: base.concat([
         "QWEAKPOINTER_ENABLE_ARROW",
         "BUILD_QMLEDITORWIDGETS_LIB",
         "QT_CREATOR"
-    ]
+    ])
     cpp.optimization: "fast"
 
     Depends { name: "cpp" }

src/libs/qmljs/qmljs.qbs

@@ -9,10 +9,10 @@ QtcLibrary {
         "..",
         "parser"
     ]
-    cpp.defines: [
+    cpp.defines: base.concat([
         "QMLJS_BUILD_DIR",
         "QT_CREATOR"
-    ]
+    ])
     cpp.optimization: "fast"
 
     Depends { name: "Utils" }

src/libs/qtcomponents/styleitem/styleitem.qbs

@@ -7,6 +7,8 @@ DynamicLibrary {
     Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["core", "widgets", "quick1", "script"] }
 
+    cpp.defines: project.additionalCppDefines
+
     files: [
         "qdeclarativefolderlistmodel.cpp",
         "qdeclarativefolderlistmodel.h",

src/libs/ssh/ssh.qbs

@@ -4,7 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary
 QtcLibrary {