Merge "Merge remote-tracking branch 'origin/4.13' into master"

doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc

@@ -214,8 +214,8 @@
     \c y properties of \e icon to those of the rectangles.
 
     \list 1
-        \li In the \uicontrol States view, click the \inlineimage plus.png
+        \li In the \uicontrol States view, select \uicontrol {Create New State}
-            button three times to create \e State1, \e State2, and \e State3.
+            three times to create \e State1, \e State2, and \e State3.
         \li Select \e State1 in \uicontrol States.
         \li Select \inlineimage icons/action-icon.png
             to open the \uicontrol Actions menu, and then select

doc/qtcreator/src/qtquick/qtquick-buttons.qdoc

@@ -229,7 +229,7 @@
     \section1 Using States to Change Component Property Values
 
     \list 1
-        \li In the \uicontrol States view, select \inlineimage plus.png
+        \li In the \uicontrol States view, select \uicontrol {Create New State}
             twice to create two new states.
             \image qmldesigner-borderimage-states.png "Active and inactive states"
         \li Select \uicontrol State1.

doc/qtcreator/src/qtquick/qtquick-states.qdoc

@@ -68,9 +68,9 @@
 
     \image qmldesigner-transitions.png "States view"
 
-    To add states, click the \inlineimage plus.png
+    To add states, select \uicontrol {Create New State}. Click the new state to
-    button. Click the new state to switch to it in \uicontrol {Form Editor},
+    switch to it in \uicontrol {Form Editor}, and then modify the properties of
-    and then modify the properties of components in \uicontrol Properties.
+    components in \uicontrol Properties.
 
     For example, to change the appearance of a button, you can hide the button
     image and show another image in its place. Or, to add movement to the view,

doc/qtdesignstudio/examples/doc/ebikedesign.qdoc

@@ -101,7 +101,7 @@
 
     We create the states for displaying the Trip, Standard, and Navigation
     screens by moving from viewport to viewport in \e Screen01.ui.qml and
-    clicking \inlineimage plus.png "Add button" in the \uicontrol States view
+    selecting \uicontrol {Create New State} in the \uicontrol States view
     when the appropriate screen is displayed in the viewport.
 
     We then create states for animations that are run when moving between the

doc/qtdesignstudio/examples/doc/loginui3.qdoc

@@ -114,8 +114,7 @@
     components in the \uicontrol {Form Editor}:
 
     \list 1
-        \li In the \uicontrol States view, select the \inlineimage plus.png
+        \li In the \uicontrol States view, select \uicontrol {Create New State}.
-            button.
             \image loginui3-login-state.png "States view"
         \li Enter \e loginState as the state name.
         \li Select \e verifyPasswordField in the \uicontrol Navigator,

doc/qtdesignstudio/examples/doc/loginui4.qdoc

@@ -257,10 +257,10 @@
     in \uicontrol Timeline:
 
     \list 1
-        \li In \uicontrol States, select the \inlineimage plus.png
+        \li In \uicontrol States, select \uicontrol {Create New State} twice to
-            button twice to add two states called \e loginState and
+            add two states called \e loginState and \e registerState. You don't
-            \e registerState. You don't need to make any property changes this
+            need to make any property changes this time, because you'll bind the
-            time, because you'll bind the states to property animations.
+            states to property animations.
         \li In \uicontrol Timeline, select the \inlineimage animation.png
             (\uicontrol {Timeline Settings (S)}) button on the toolbar (or press
             \key S to open the \uicontrol {Timeline Settings} dialog.

doc/qtdesignstudio/examples/doc/sidemenu.qdoc

@@ -142,8 +142,8 @@
     another animation is run that closes the side menu. When the animation
     finishes, the side menu returns to the \e closed state.
 
-    We select the \inlineimage plus.png
+    We select \uicontrol {Create New State} in the \uicontrol States view to add
-    (\uicontrol Add) button in the \uicontrol States view to add the states:
+    the states:
 
     \image sidemenu-states.png "Side menu states"
 

src/libs/utils/outputformatter.cpp

@@ -216,6 +216,7 @@ public:
     PostPrintAction postPrintAction;
     bool boldFontEnabled = true;
     bool prependCarriageReturn = false;
+    bool prependLineFeed = false;
 };
 
 OutputFormatter::OutputFormatter() : d(new Private) { }
@@ -436,6 +437,7 @@ void OutputFormatter::append(const QString &text, const QTextCharFormat &format)
         d->cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
         startPos = crPos + 1;
     }
+    flushTrailingNewline();
     if (startPos < text.count())
         d->cursor.insertText(text.mid(startPos), format);
 }
@@ -495,6 +497,14 @@ void OutputFormatter::flushIncompleteLine()
     d->incompleteLine.first.clear();
 }
 
+void Utils::OutputFormatter::flushTrailingNewline()
+{
+    if (d->prependLineFeed) {
+        d->cursor.insertText("\n");
+        d->prependLineFeed = false;
+    }
+}
+
 void OutputFormatter::dumpIncompleteLine(const QString &line, OutputFormat format)
 {
     if (line.isEmpty())
@@ -560,6 +570,7 @@ void OutputFormatter::flush()
 {
     if (!d->incompleteLine.first.isEmpty())
         flushIncompleteLine();
+    flushTrailingNewline();
     d->escapeCodeHandler.endFormatScope();
     for (OutputLineParser * const p : qAsConst(d->lineParsers))
         p->flush();
@@ -641,7 +652,8 @@ void OutputFormatter::appendMessage(const QString &text, OutputFormat format)
             dumpIncompleteLine(out.mid(startPos), format);
             break;
         }
-        doAppendMessage(out.mid(startPos, eolPos - startPos + 1), format);
+        doAppendMessage(out.mid(startPos, eolPos - startPos), format);
+        d->prependLineFeed = true;
         startPos = eolPos + 1;
     }
 }

src/libs/utils/outputformatter.h

@@ -83,8 +83,8 @@ public:
     void setDemoteErrorsToWarnings(bool demote);
     bool demoteErrorsToWarnings() const;
 
-    // line contains at most one line feed character, and if it does occur, it's the last character.
+    // Represents a single line, without a trailing line feed character.
-    // Either way, the input is to be considered "complete" for parsing purposes.
+    // The input is to be considered "complete" for parsing purposes.
     virtual Result handleLine(const QString &line, OutputFormat format) = 0;
 
     virtual bool handleLink(const QString &href) { Q_UNUSED(href); return false; }
@@ -183,6 +183,7 @@ private:
     void append(const QString &text, const QTextCharFormat &format);
     void initFormats();
     void flushIncompleteLine();
+    void flushTrailingNewline();
     void dumpIncompleteLine(const QString &line, OutputFormat format);
     void clearLastLine();
     QList<FormattedText> parseAnsi(const QString &text, const QTextCharFormat &format);

src/plugins/cppeditor/cpphighlighter.cpp

@@ -396,6 +396,8 @@ bool CppHighlighter::highlightRawStringLiteral(const QStringView &_text, const T
     if (text.at(tk.utf16charsEnd() - 1) != '"')
         return false;
     const int endDelimiterOffset = tk.utf16charsEnd() - 1 - delimiter.length();
+    if (endDelimiterOffset <= delimiterOffset)
+        return false;
     if (text.mid(endDelimiterOffset, delimiter.length()) != delimiter)
         return false;
     if (text.at(endDelimiterOffset - 1) != ')')

src/plugins/git/githighlighters.cpp

@@ -104,6 +104,11 @@ static TextEditor::TextStyle styleForFormat(int format)
     case Format_Squash: return C_ENUMERATION;
     case Format_Fixup: return C_NUMBER;
     case Format_Exec: return C_LABEL;
+    case Format_Break: return C_PREPROCESSOR;
+    case Format_Drop: return C_REMOVED_LINE;
+    case Format_Label: return C_LABEL;
+    case Format_Reset: return C_LABEL;
+    case Format_Merge: return C_LABEL;
     case Format_Count:
         QTC_CHECK(false); // should never get here
         return C_TEXT;
@@ -125,6 +130,11 @@ GitRebaseHighlighter::GitRebaseHighlighter(QTextDocument *parent) :
     m_actions << RebaseAction("^(s|squash)\\b", Format_Squash);
     m_actions << RebaseAction("^(f|fixup)\\b", Format_Fixup);
     m_actions << RebaseAction("^(x|exec)\\b", Format_Exec);
+    m_actions << RebaseAction("^(b|break)\\b", Format_Break);
+    m_actions << RebaseAction("^(d|drop)\\b", Format_Drop);
+    m_actions << RebaseAction("^(l|label)\\b", Format_Label);
+    m_actions << RebaseAction("^(t|reset)\\b", Format_Reset);
+    m_actions << RebaseAction("^(m|merge)\\b", Format_Merge);
 }
 
 void GitRebaseHighlighter::highlightBlock(const QString &text)

src/plugins/git/githighlighters.h

@@ -42,6 +42,11 @@ enum Format {
     Format_Squash,
     Format_Fixup,
     Format_Exec,
+    Format_Break,
+    Format_Drop,
+    Format_Label,
+    Format_Reset,
+    Format_Merge,
     Format_Count
 };
 

src/plugins/projectexplorer/linuxiccparser.cpp

@@ -57,7 +57,7 @@ LinuxIccParser::LinuxIccParser() :
 
     // ".pch/Qt5Core.pchi.cpp": creating precompiled header file ".pch/Qt5Core.pchi"
     // "animation/qabstractanimation.cpp": using precompiled header file ".pch/Qt5Core.pchi"
-    m_pchInfoLine.setPattern(QLatin1String("^\".*?\": (creating|using) precompiled header file \".*?\"\n$"));
+    m_pchInfoLine.setPattern(QLatin1String("^\".*?\": (creating|using) precompiled header file \".*?\"$"));
     QTC_CHECK(m_pchInfoLine.isValid());
 }
 

src/plugins/projectexplorer/outputparser_test.cpp

@@ -115,11 +115,10 @@ TestTerminator::TestTerminator(OutputParserTester *t) :
 
 Utils::OutputLineParser::Result TestTerminator::handleLine(const QString &line, Utils::OutputFormat type)
 {
-    QTC_CHECK(line.endsWith('\n'));
     if (type == Utils::StdOutFormat)
-        m_tester->m_receivedStdOutChildLine.append(line);
+        m_tester->m_receivedStdOutChildLine.append(line + '\n');
     else
-        m_tester->m_receivedStdErrChildLine.append(line);
+        m_tester->m_receivedStdErrChildLine.append(line + '\n');
     return Status::Done;
 }
 

src/plugins/projectexplorer/task.cpp

@@ -67,7 +67,7 @@ Task::Task(TaskType type_, const QString &description,
            const QIcon &icon, Options options) :
     taskId(s_nextId), type(type_), options(options), summary(description),
     line(line_), movedLine(line_), category(category_),
-    icon(icon.isNull() ? taskTypeIcon(type_) : icon)
+    m_icon(icon)
 {
     ++s_nextId;
     setFile(file_);
@@ -108,7 +108,7 @@ void Task::clear()
     line = -1;
     movedLine = -1;
     category = Utils::Id();
-    icon = QIcon();
+    m_icon = QIcon();
     formats.clear();
     m_mark.clear();
 }
@@ -133,6 +133,13 @@ QString Task::description() const
     return desc;
 }
 
+QIcon Task::icon() const
+{
+    if (m_icon.isNull())
+        m_icon = taskTypeIcon(type);
+    return m_icon;
+}
+
 //
 // functions
 //

src/plugins/projectexplorer/task.h

@@ -74,6 +74,7 @@ public:
     void clear();
     void setFile(const Utils::FilePath &file);
     QString description() const;
+    QIcon icon() const;
 
     unsigned int taskId = 0;
     TaskType type = Unknown;
@@ -85,7 +86,6 @@ public:
     int line = -1;
     int movedLine = -1; // contains a line number if the line was moved in the editor
     Utils::Id category;
-    QIcon icon;
 
     // Having a container of QTextLayout::FormatRange in Task isn't that great
     // It would be cleaner to split up the text into
@@ -101,6 +101,7 @@ private:
     void setMark(TextEditor::TextMark *mark);
 
     QSharedPointer<TextEditor::TextMark> m_mark;
+    mutable QIcon m_icon;
     static unsigned int s_nextId;
 
     friend class TaskHub;

src/plugins/projectexplorer/taskhub.cpp

@@ -78,8 +78,8 @@ public:
         } else {
             setToolTip(task.description());
         }
-        setIcon(task.icon);
+        setIcon(task.icon());
-        setVisible(!task.icon.isNull());
+        setVisible(!task.icon().isNull());
     }
 
     bool isClickable() const override;

src/plugins/projectexplorer/taskmodel.cpp

@@ -255,7 +255,7 @@ QVariant TaskModel::data(const QModelIndex &index, int role) const
     else if (role == TaskModel::Category)
         return m_tasks.at(index.row()).category.uniqueIdentifier();
     else if (role == TaskModel::Icon)
-        return m_tasks.at(index.row()).icon;
+        return m_tasks.at(index.row()).icon();
     else if (role == TaskModel::Task_t)
         return QVariant::fromValue(task(index));
     return QVariant();

src/plugins/qmldesigner/CMakeLists.txt

@@ -334,6 +334,8 @@ extend_qtc_plugin(QmlDesigner
     navigatortreeview.cpp navigatortreeview.h
     navigatorview.cpp navigatorview.h
     navigatorwidget.cpp navigatorwidget.h
+    choosetexturepropertydialog.cpp choosetexturepropertydialog.h
+    choosetexturepropertydialog.ui
 )
 
 extend_qtc_plugin(QmlDesigner

src/plugins/qmldesigner/qmldesignerplugin.qbs

@@ -610,6 +610,9 @@ Project {
                 "navigator/navigatorview.h",
                 "navigator/navigatorwidget.cpp",
                 "navigator/navigatorwidget.h",
+                "navigator/choosetexturepropertydialog.cpp",
+                "navigator/choosetexturepropertydialog.h",
+                "navigator/choosetexturepropertydialog.ui",
                 "propertyeditor/aligndistribute.cpp",
                 "propertyeditor/aligndistribute.h",
                 "propertyeditor/designerpropertymap.cpp",

src/plugins/qtsupport/qtoutputformatter.cpp

@@ -511,6 +511,7 @@ void QtSupportPlugin::testQtOutputFormatter_appendMixedAssertAndAnsi()
                 "Blue\n";
 
     formatter.appendMessage(inputText, StdOutFormat);
+    formatter.flush();
 
     QCOMPARE(edit.toPlainText(), outputText);