Merge "Merge remote-tracking branch 'origin/4.7'"

doc/src/qtquick/qtquick-components.qdoc

@@ -116,6 +116,13 @@
         \li \l{ListView}{List View} provides a list vizualization of a model.
         \li \l{PathView}{Path View} visualizes the contents of a model along a
             path.
+        \li \l [QtQuickControls2] {ScrollView}{Scroll View} provides scrolling
+            for user-defined content. It can be used instead of a \l Flickable
+            item.
+        \li \l [QtQuickControls2] {StackView}{Stack View} provides a stack-based
+            navigation model.
+        \li \l[QtQuickControls2] {SwipeView}{Swipe View} enables users to
+            navigate pages by swiping sideways.
     \endlist
 
     When you add a \l{GridView}{Grid View}, \l{ListView}{List View}, or
@@ -124,7 +131,9 @@
     You can edit item properties in the \uicontrol Properties pane or
     in the \uicontrol {Text Editor}. You can also replace the default model and
     delegate with other, more complex models and delegates in the
-    \uicontrol {Text Editor}.
+    \uicontrol {Text Editor}. \l{ItemDelegate}{Item Delegate} and
+    \l{SwipeDelegate}{Swipe Delegate} delegate components are also available
+    in the \uicontrol Library.
 
     \section1 Positioning Items on Screens
 
@@ -332,6 +341,8 @@
             logical group of controls together, within a titled visual frame.
         \li \l [QtQuickControls2]{Label} is a text label with inherited styling
             and font.
+        \li \l [QtQuickControls2]{Page} provides a styled page control with
+            support for a header and footer.
         \li \l [QtQuickControls2]{PageIndicator}{Page Indicator} indicates the
             currently active page.
         \li \l [QtQuickControls2]{Pane} provides a background matching with the
@@ -367,16 +378,20 @@
             item delegate that can be toggled on (checked) or off (unchecked).
         \li \l [QtQuickControls2]{ComboBox}{Combo Box} is a combined button and
             popup list that is populated by using a data model.
+        \li \l [QtQuickControls2]{DelayButton}{Delay Button} provides an option
+            button that is triggered when held down long enough.
         \li \l [QtQuickControls2]{Dial} is a circular dial that is rotated to
             set a value.
-        \li \l [QtQuickControls2]{ItemDelegate}{Item Delegate} is a standard
-            view item that can be used in various views and controls.
         \li \l [QtQuickControls2]{ProgressBar}{Progress Bar} indicates the
             progress of an operation.
         \li \l [QtQuickControls2]{RadioButton}{Radio Button} provides an option
             button that can be switched on (checked) or off (unchecked).
         \li \l [QtQuickControls2]{RadioDelegate}{Radio Delegate} presents an
             item delegate that can be toggled on (checked) or off (unchecked).
+        \li \l [QtQuickControls2]{RangeSlider}{Range Slider} enables users to
+            select a range of values by sliding two handles along a track.
+        \li \l [QtQuickControls2]{RoundButton}{Round Button} provides a push
+            button with rounded corners that you can associate with an action.
         \li \l [QtQuickControls2]{Slider} selects a value by sliding a handle
             along a track.
         \li \l [QtQuickControls2]{SpinBox}{Spin Box} enables the user to specify
@@ -384,6 +399,13 @@
             on the keyboard, or by entering a value in the box.
         \li \l [QtQuickControls2]{Switch} is an option button that can be
             toggled on or off.
+        \li \l [QtQuickControls2]{SwitchDelegate}{SwitchDelegate} presents an
+            item delegate with a switch indicator that can be toggled on or off.
+        \li \l [QtQuickControls2] {TabBar}{Tab Bar} enables users to switch
+            between different views or subtasks.
+        \li \l [QtQuickControls2]{TabButton}{Tab Button} is a button
+            that is functionally similar to \uicontrol Button, but provides a
+            look that is more suitable for a \uicontrol {Tab Bar}.
         \li \l [QtQuickControls2]{TextArea}{Text Area} displays multiple lines
             of editable formatted text.
         \li \l [QtQuickControls2]{TextField}{Text Field} displays a single line
@@ -394,6 +416,8 @@
         \li \l [QtQuickControls2]{ToolButton}{Tool Button} is a button
             that is functionally similar to \uicontrol Button, but provides a
             look that is more suitable for a \uicontrol {Tool Bar}.
+        \li \l [QtQuickControls2]{ToolSeparator}{Tool Separator} separates a
+            group of items from adjacent items on a \uicontrol {Tool Bar}.
         \li \l [QtQuickControls2]{Tumbler} is a spinnable wheel of items that
             can be selected.
     \endlist

src/plugins/debugger/qml/qmlengine.cpp

@@ -758,22 +758,19 @@ void QmlEngine::changeBreakpoint(Breakpoint bp)
     BreakpointResponse br = bp.response();
     if (params.type == BreakpointAtJavaScriptThrow) {
         d->setExceptionBreak(AllExceptions, params.enabled);
-        br.enabled = params.enabled;
-        bp.setResponse(br);
     } else if (params.type == BreakpointOnQmlSignalEmit) {
         d->setBreakpoint(EVENT, params.functionName, params.enabled);
-        br.enabled = params.enabled;
-        bp.setResponse(br);
     } else if (d->canChangeBreakpoint()) {
         d->changeBreakpoint(d->breakpoints.value(bp.id()), params.enabled);
     } else {
-        //V8 supports only minimalistic changes in breakpoint
+        d->clearBreakpoint(d->breakpoints.take(bp.id()));
-        //Remove the breakpoint and add again
+        d->setBreakpoint(SCRIPTREGEXP, params.fileName,
-        bp.notifyBreakpointChangeOk();
+                         params.enabled, params.lineNumber, 0,
-        bp.removeBreakpoint();
+                         params.condition, params.ignoreCount);
-        BreakHandler *handler = d->engine->breakHandler();
+        d->breakpointsSync.insert(d->sequence, bp.id());
-        handler->appendBreakpoint(params);
     }
+    br.enabled = params.enabled;
+    bp.setResponse(br);
 
     if (bp.state() == BreakpointChangeProceeding)
         bp.notifyBreakpointChangeOk();

src/plugins/projectexplorer/abstractmsvctoolchain.cpp

@@ -363,16 +363,12 @@ Utils::optional<QString> AbstractMsvcToolChain::generateEnvironmentSettings(cons
     run.setCodec(QTextCodec::codecForName("UTF-8"));
     Utils::SynchronousProcessResponse response = run.runBlocking(cmdPath.toString(), cmdArguments);
 
-    QString command = QDir::toNativeSeparators(batchFile);
-    if (!response.stdErr().isEmpty()) {
-        return QCoreApplication::translate("ProjectExplorer::Internal::AbstractMsvcToolChain",
-                                           "Failed to retrieve MSVC Environment from \"%1\":\n"
-                                           "%2").arg(command, response.stdErr());
-    }
-
     if (response.result != Utils::SynchronousProcessResponse::Finished) {
-        const QString message = response.exitMessage(cmdPath.toString(), 10);
+        const QString message = !response.stdErr().isEmpty()
+                ? response.stdErr()
+                : response.exitMessage(cmdPath.toString(), 10);
         qWarning().noquote() << message;
+        QString command = QDir::toNativeSeparators(batchFile);
         if (!batchArgs.isEmpty())
             command += ' ' + batchArgs;
         return QCoreApplication::translate("ProjectExplorer::Internal::AbstractMsvcToolChain",

src/plugins/qbsprojectmanager/qbsprojectmanager.qbs

@@ -135,7 +135,7 @@ QtcPlugin {
         ]
     }
 
-    Depends { name: "qbs resources" }
+    Depends { name: "qbs resources"; condition: updateQmlTypeInfo }
     Rule {
         condition: updateQmlTypeInfo
         inputsFromDependencies: ["qbs qml type descriptions", "qbs qml type bundle"]

src/shared/clang/clang_installation.pri

@@ -130,6 +130,9 @@ isEmpty(LLVM_VERSION) {
     LLVM_BINDIR = $$quote($$system($$llvm_config --bindir, lines))
     LLVM_INCLUDEPATH = $$system($$llvm_config --includedir, lines)
     msvc {
+        # CLANG-UPGRADE-CHECK: Remove suppression if this warning is resolved.
+        # Suppress unreferenced formal parameter warnings
+        QMAKE_CXXFLAGS += -wd4100
         LLVM_STATIC_LIBS_STRING += $$system($$llvm_config --libnames, lines)
     } else {
         LLVM_STATIC_LIBS_STRING += $$system($$llvm_config --libs, lines)