Merge remote-tracking branch 'origin/2.8'

25 files changed, 51 insertions, 174 deletions

diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs
index 85e27024df2..44a6641cb85 100644
--- a/src/libs/QtcLibrary.qbs
+++ b/src/libs/QtcLibrary.qbs
@@ -18,7 +18,7 @@ DynamicLibrary {
                                       : ["$ORIGIN", "$ORIGIN/.."]
     cpp.includePaths: [ ".", ".." ]
 
-    ProductModule {
+    Export {
         Depends { name: "cpp" }
         cpp.includePaths: [ "." ]
     }
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index 20041d86340..31ea51c9400 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -168,7 +168,7 @@ QtcLibrary {
         "images/var_prot.png",
     ]
 
-    ProductModule {
+    Export {
         Depends { name: "cpp" }
         cpp.includePaths: [
             "../3rdparty"
diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.cpp b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp
index 495fa825335..5af62c4e397 100644
--- a/src/libs/qmleditorwidgets/contextpanetextwidget.cpp
+++ b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp
@@ -398,24 +398,11 @@ void ContextPaneTextWidget::onVerticalAlignmentChanged()
     }
 }
 
-
 ContextPaneTextWidget::~ContextPaneTextWidget()
 {
     delete ui;
 }
 
-void ContextPaneTextWidget::changeEvent(QEvent *e)
-{
-    QWidget::changeEvent(e);
-    switch (e->type()) {
-    case QEvent::LanguageChange:
-        ui->retranslateUi(this);
-        break;
-    default:
-        break;
-    }
-}
-
 void ContextPaneTextWidget::timerEvent(QTimerEvent *event)
 {
     if (event->timerId() == m_fontSizeTimer) {
diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.h b/src/libs/qmleditorwidgets/contextpanetextwidget.h
index b82a4561576..09ff5e8c26f 100644
--- a/src/libs/qmleditorwidgets/contextpanetextwidget.h
+++ b/src/libs/qmleditorwidgets/contextpanetextwidget.h
@@ -82,7 +82,6 @@ signals:
     void removeAndChangeProperty(const QString &, const QString &, const QVariant &, bool removeFirst);
 
 protected:
-    void changeEvent(QEvent *e);
     void timerEvent(QTimerEvent *event);
 
 private:
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp
index 1bd8924b6ba..eca08408a56 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp
@@ -271,18 +271,6 @@ void ContextPaneWidgetRectangle::timerEvent(QTimerEvent *event)
     }
 }
 
-void ContextPaneWidgetRectangle::changeEvent(QEvent *e)
-{
-    QWidget::changeEvent(e);
-    switch (e->type()) {
-    case QEvent::LanguageChange:
-        ui->retranslateUi(this);
-        break;
-    default:
-        break;
-    }
-}
-
 void ContextPaneWidgetRectangle::setColor()
 {
     QLinearGradient gradient;
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
index 8d2ae8a08db..6d95ed01625 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
+++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
@@ -74,7 +74,6 @@ signals:
     void removeAndChangeProperty(const QString &, const QString &, const QVariant &, bool removeFirst);
 
 protected:
-    void changeEvent(QEvent *e);
     void timerEvent(QTimerEvent *event);
 
 private:
diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
index 0833f6acb9f..d54efe5c59a 100644
--- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
+++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
@@ -207,18 +207,6 @@ void EasingContextPane::setProperties(QmlJS::PropertyReader *propertyReader)
         ui->durationSpinBox->setValue(250);
 }
 
-void EasingContextPane::changeEvent(QEvent *e)
-{
-    QWidget::changeEvent(e);
-    switch (e->type()) {
-    case QEvent::LanguageChange:
-        ui->retranslateUi(this);
-        break;
-    default:
-        break;
-    }
-}
-
 void EasingContextPane::setGraphDisplayMode(GraphDisplayMode newMode)
 {
     m_displayMode = newMode;
diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h
index f2b4aa5c614..2c9316e1eba 100644
--- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h
+++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h
@@ -69,8 +69,6 @@ signals:
     void removeAndChangeProperty(const QString &, const QString &, const QVariant &, bool);
 
 protected:
-    void changeEvent(QEvent *e);
-
     void setOthers();
     void setLinear();
     void setBack();
@@ -84,7 +82,6 @@ private:
     EasingSimulation *m_simulation;
 
 private slots:
-
     void on_playButton_clicked();
     void on_overshootSpinBox_valueChanged(double );
     void on_periodSpinBox_valueChanged(double );
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index bf0efb0611c..4253e0bb09c 100644
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -106,7 +106,7 @@ QtcLibrary {
         "iscriptevaluator.h"
     ]
 
-    ProductModule {
+    Export {
         Depends { name: "cpp" }
         Depends { name: "LanguageUtils" }
     }
diff --git a/src/libs/qtcreatorcdbext/containers.cpp b/src/libs/qtcreatorcdbext/containers.cpp
index 37de100fcb6..58e87b0a2ca 100644
--- a/src/libs/qtcreatorcdbext/containers.cpp
+++ b/src/libs/qtcreatorcdbext/containers.cpp
@@ -949,7 +949,7 @@ static inline AbstractSymbolGroupNodePtrVector qMap5Nodes(const SymbolGroupValue
         return AbstractSymbolGroupNodePtrVector();
     if (SymbolGroupValue::verbose > 1)
         nodeTree->debug(DebugPrint(), debugQMap5Node);
-    int i = 0;
+    VectorIndexType i = 0;
     // Finally convert them into real nodes 'QHashNode<K,V> (potentially expensive)
     const std::string nodeType = qHashNodeType(v, "Node");
     const std::string nodePtrType = nodeType +  " *";
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index edc5663c914..571821c22c9 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -114,7 +114,7 @@ QtcLibrary {
         ]
     }
 
-    ProductModule {
+    Export {
         Depends { name: "Qt"; submodules: ["widgets", "network"] }
     }
 }
diff --git a/src/libs/utils/filewizardpage.cpp b/src/libs/utils/filewizardpage.cpp
index 7b1e3c1d893..5958e9de82e 100644
--- a/src/libs/utils/filewizardpage.cpp
+++ b/src/libs/utils/filewizardpage.cpp
@@ -92,18 +92,6 @@ void FileWizardPage::setFileName(const QString &name)
     d->m_ui.nameLineEdit->setText(name);
 }
 
-void FileWizardPage::changeEvent(QEvent *e)
-{
-    QWizardPage::changeEvent(e);
-    switch (e->type()) {
-    case QEvent::LanguageChange:
-        d->m_ui.retranslateUi(this);
-        break;
-    default:
-        break;
-    }
-}
-
 bool FileWizardPage::isComplete() const
 {
     return d->m_complete;
diff --git a/src/libs/utils/filewizardpage.h b/src/libs/utils/filewizardpage.h
index 5cad4893f94..8982acd535a 100644
--- a/src/libs/utils/filewizardpage.h
+++ b/src/libs/utils/filewizardpage.h
@@ -74,9 +74,6 @@ private slots:
     void slotValidChanged();
     void slotActivated();
 
-protected:
-    virtual void changeEvent(QEvent *e);
-
 private:
     FileWizardPagePrivate *d;
 };
diff --git a/src/libs/utils/images/crumblepath-segment-end.png b/src/libs/utils/images/crumblepath-segment-end.png
index 1fc371cfec1..b472d595fbe 100644
--- a/src/libs/utils/images/crumblepath-segment-end.png
+++ b/src/libs/utils/images/crumblepath-segment-end.png
diff --git a/src/libs/utils/images/crumblepath-segment-hover-end.png b/src/libs/utils/images/crumblepath-segment-hover-end.png
index 5663d29ee67..d972750d003 100644
--- a/src/libs/utils/images/crumblepath-segment-hover-end.png
+++ b/src/libs/utils/images/crumblepath-segment-hover-end.png
diff --git a/src/libs/utils/images/crumblepath-segment-hover.png b/src/libs/utils/images/crumblepath-segment-hover.png
index 741f0575dd7..d6d89025b01 100644
--- a/src/libs/utils/images/crumblepath-segment-hover.png
+++ b/src/libs/utils/images/crumblepath-segment-hover.png
diff --git a/src/libs/utils/images/crumblepath-segment-selected-end.png b/src/libs/utils/images/crumblepath-segment-selected-end.png
index 6ef4e05b45f..8e79c969e37 100644
--- a/src/libs/utils/images/crumblepath-segment-selected-end.png
+++ b/src/libs/utils/images/crumblepath-segment-selected-end.png
diff --git a/src/libs/utils/images/crumblepath-segment-selected.png b/src/libs/utils/images/crumblepath-segment-selected.png
index c674099b5a1..d6115fc968f 100644
--- a/src/libs/utils/images/crumblepath-segment-selected.png
+++ b/src/libs/utils/images/crumblepath-segment-selected.png
diff --git a/src/libs/utils/images/crumblepath-segment.png b/src/libs/utils/images/crumblepath-segment.png
index ad6e7165f6c..7fa41efe292 100644
--- a/src/libs/utils/images/crumblepath-segment.png
+++ b/src/libs/utils/images/crumblepath-segment.png
diff --git a/src/libs/utils/projectintropage.cpp b/src/libs/utils/projectintropage.cpp
index f238a8145b4..5755d0b2513 100644
--- a/src/libs/utils/projectintropage.cpp
+++ b/src/libs/utils/projectintropage.cpp
@@ -138,18 +138,6 @@ void ProjectIntroPage::setDescription(const QString &description)
     d->m_ui.descriptionLabel->setText(description);
 }
 
-void ProjectIntroPage::changeEvent(QEvent *e)
-{
-    QWizardPage::changeEvent(e);
-    switch (e->type()) {
-    case QEvent::LanguageChange:
-        d->m_ui.retranslateUi(this);
-        break;
-    default:
-        break;
-    }
-}
-
 bool ProjectIntroPage::isComplete() const
 {
     return d->m_complete;
diff --git a/src/libs/utils/projectintropage.h b/src/libs/utils/projectintropage.h
index cb74e354946..b5520594ae5 100644
--- a/src/libs/utils/projectintropage.h
+++ b/src/libs/utils/projectintropage.h
@@ -80,9 +80,6 @@ private slots:
     void slotChanged();
     void slotActivated();
 
-protected:
-    virtual void changeEvent(QEvent *e);
-
 private:
     enum StatusLabelMode { Error, Warning, Hint };
 
diff --git a/src/libs/utils/savedaction.cpp b/src/libs/utils/savedaction.cpp
index 07068ce326b..953c1613657 100644
--- a/src/libs/utils/savedaction.cpp
+++ b/src/libs/utils/savedaction.cpp
@@ -31,6 +31,7 @@
 
 #include <utils/qtcassert.h>
 #include <utils/pathchooser.h>
+#include <utils/pathlisteditor.h>
 
 #include <QDebug>
 #include <QSettings>
@@ -313,6 +314,8 @@ void SavedAction::connectWidget(QWidget *widget, ApplyMode applyMode)
     } else if (QTextEdit *textEdit = qobject_cast<QTextEdit *>(widget)) {
         textEdit->setPlainText(m_value.toString());
         connect(textEdit, SIGNAL(textChanged()), this, SLOT(textEditTextChanged()));
+    } else if (PathListEditor *editor = qobject_cast<PathListEditor *>(widget)) {
+        editor->setPathList(m_value.toStringList());
     } else {
         qDebug() << "Cannot connect widget " << widget << toString();
     }
@@ -342,6 +345,8 @@ void SavedAction::apply(QSettings *s)
         setValue(groupBox->isChecked());
     else if (const QTextEdit *textEdit = qobject_cast<QTextEdit *>(m_widget))
         setValue(textEdit->toPlainText());
+    else if (const PathListEditor *editor = qobject_cast<PathListEditor *>(m_widget))
+        setValue(editor->pathList());
     if (s)
        writeSettings(s);
 }
diff --git a/src/libs/utils/uncommentselection.cpp b/src/libs/utils/uncommentselection.cpp
index 26159c043f2..dae53e3cd43 100644
--- a/src/libs/utils/uncommentselection.cpp
+++ b/src/libs/utils/uncommentselection.cpp
@@ -34,69 +34,32 @@
 using namespace Utils;
 
 CommentDefinition::CommentDefinition() :
-    m_afterWhiteSpaces(false),
-    m_singleLine(QLatin1String("//")),
-    m_multiLineStart(QLatin1String("/*")),
-    m_multiLineEnd(QLatin1String("*/"))
+    isAfterWhiteSpaces(false),
+    singleLine(QLatin1String("//")),
+    multiLineStart(QLatin1String("/*")),
+    multiLineEnd(QLatin1String("*/"))
 {}
 
-CommentDefinition &CommentDefinition::setAfterWhiteSpaces(const bool afterWhiteSpaces)
-{
-    m_afterWhiteSpaces = afterWhiteSpaces;
-    return *this;
-}
-
-CommentDefinition &CommentDefinition::setSingleLine(const QString &singleLine)
-{
-    m_singleLine = singleLine;
-    return *this;
-}
-
-CommentDefinition &CommentDefinition::setMultiLineStart(const QString &multiLineStart)
+bool CommentDefinition::hasSingleLineStyle() const
 {
-    m_multiLineStart = multiLineStart;
-    return *this;
+    return !singleLine.isEmpty();
 }
 
-CommentDefinition &CommentDefinition::setMultiLineEnd(const QString &multiLineEnd)
+bool CommentDefinition::hasMultiLineStyle() const
 {
-    m_multiLineEnd = multiLineEnd;
-    return *this;
+    return !multiLineStart.isEmpty() && !multiLineEnd.isEmpty();
 }
 
-bool CommentDefinition::isAfterWhiteSpaces() const
-{ return m_afterWhiteSpaces; }
-
-const QString &CommentDefinition::singleLine() const
-{ return m_singleLine; }
-
-const QString &CommentDefinition::multiLineStart() const
-{ return m_multiLineStart; }
-
-const QString &CommentDefinition::multiLineEnd() const
-{ return m_multiLineEnd; }
-
-bool CommentDefinition::hasSingleLineStyle() const
-{ return !m_singleLine.isEmpty(); }
-
-bool CommentDefinition::hasMultiLineStyle() const
-{ return !m_multiLineStart.isEmpty() && !m_multiLineEnd.isEmpty(); }
-
 void CommentDefinition::clearCommentStyles()
 {
-    m_singleLine.clear();
-    m_multiLineStart.clear();
-    m_multiLineEnd.clear();
+    singleLine.clear();
+    multiLineStart.clear();
+    multiLineEnd.clear();
 }
 
-namespace {
-
-bool isComment(const QString &text,
-               int index,
-               const CommentDefinition &definition,
-               const QString & (CommentDefinition::* comment) () const)
+static bool isComment(const QString &text, int index,
+   const QString &commentType)
 {
-    const QString &commentType = ((definition).*(comment))();
     const int length = commentType.length();
 
     Q_ASSERT(text.length() - index >= length);
@@ -110,8 +73,6 @@ bool isComment(const QString &text,
     return true;
 }
 
-} // namespace anynomous
-
 
 void Utils::unCommentSelection(QPlainTextEdit *edit, const CommentDefinition &definition)
 {
@@ -146,42 +107,35 @@ void Utils::unCommentSelection(QPlainTextEdit *edit, const CommentDefinition &de
 
         QString startText = startBlock.text();
         int startPos = start - startBlock.position();
-        const int multiLineStartLength = definition.multiLineStart().length();
+        const int multiLineStartLength = definition.multiLineStart.length();
         bool hasLeadingCharacters = !startText.left(startPos).trimmed().isEmpty();
 
         if (startPos >= multiLineStartLength
             && isComment(startText,
                          startPos - multiLineStartLength,
-                         definition,
-                         &CommentDefinition::multiLineStart)) {
+                         definition.multiLineStart)) {
             startPos -= multiLineStartLength;
             start -= multiLineStartLength;
         }
 
-        bool hasSelStart = (startPos <= startText.length() - multiLineStartLength
-                            && isComment(startText,
-                                         startPos,
-                                         definition,
-                                         &CommentDefinition::multiLineStart));
+        bool hasSelStart = startPos <= startText.length() - multiLineStartLength
+            && isComment(startText, startPos, definition.multiLineStart);
 
         QString endText = endBlock.text();
         int endPos = end - endBlock.position();
-        const int multiLineEndLength = definition.multiLineEnd().length();
+        const int multiLineEndLength = definition.multiLineEnd.length();
         bool hasTrailingCharacters =
-                !endText.left(endPos).remove(definition.singleLine()).trimmed().isEmpty()
+                !endText.left(endPos).remove(definition.singleLine).trimmed().isEmpty()
                 && !endText.mid(endPos).trimmed().isEmpty();
 
         if (endPos <= endText.length() - multiLineEndLength
-            && isComment(endText, endPos, definition, &CommentDefinition::multiLineEnd)) {
+            && isComment(endText, endPos, definition.multiLineEnd)) {
             endPos += multiLineEndLength;
             end += multiLineEndLength;
         }
 
-        bool hasSelEnd = (endPos >= multiLineEndLength
-                          && isComment(endText,
-                                       endPos - multiLineEndLength,
-                                       definition,
-                                       &CommentDefinition::multiLineEnd));
+        bool hasSelEnd = endPos >= multiLineEndLength
+            && isComment(endText, endPos - multiLineEndLength, definition.multiLineEnd);
 
         doMultiLineStyleUncomment = hasSelStart && hasSelEnd;
         doMultiLineStyleComment = !doMultiLineStyleUncomment
@@ -191,8 +145,8 @@ void Utils::unCommentSelection(QPlainTextEdit *edit, const CommentDefinition &de
     } else if (!hasSelection && !definition.hasSingleLineStyle()) {
 
         QString text = startBlock.text().trimmed();
-        doMultiLineStyleUncomment = text.startsWith(definition.multiLineStart())
-                                    && text.endsWith(definition.multiLineEnd());
+        doMultiLineStyleUncomment = text.startsWith(definition.multiLineStart)
+                                    && text.endsWith(definition.multiLineEnd);
         doMultiLineStyleComment = !doMultiLineStyleUncomment && !text.isEmpty();
 
         start = startBlock.position();
@@ -212,36 +166,36 @@ void Utils::unCommentSelection(QPlainTextEdit *edit, const CommentDefinition &de
         cursor.setPosition(end);
         cursor.movePosition(QTextCursor::PreviousCharacter,
                             QTextCursor::KeepAnchor,
-                            definition.multiLineEnd().length());
+                            definition.multiLineEnd.length());
         cursor.removeSelectedText();
         cursor.setPosition(start);
         cursor.movePosition(QTextCursor::NextCharacter,
                             QTextCursor::KeepAnchor,
-                            definition.multiLineStart().length());
+                            definition.multiLineStart.length());
         cursor.removeSelectedText();
     } else if (doMultiLineStyleComment) {
         cursor.setPosition(end);
-        cursor.insertText(definition.multiLineEnd());
+        cursor.insertText(definition.multiLineEnd);
         cursor.setPosition(start);
-        cursor.insertText(definition.multiLineStart());
+        cursor.insertText(definition.multiLineStart);
     } else {
         endBlock = endBlock.next();
         doSingleLineStyleUncomment = true;
         for (QTextBlock block = startBlock; block != endBlock; block = block.next()) {
             QString text = block.text().trimmed();
-            if (!text.isEmpty() && !text.startsWith(definition.singleLine())) {
+            if (!text.isEmpty() && !text.startsWith(definition.singleLine)) {
                 doSingleLineStyleUncomment = false;
                 break;
             }
         }
 
-        const int singleLineLength = definition.singleLine().length();
+        const int singleLineLength = definition.singleLine.length();
         for (QTextBlock block = startBlock; block != endBlock; block = block.next()) {
             if (doSingleLineStyleUncomment) {
                 QString text = block.text();
                 int i = 0;
                 while (i <= text.size() - singleLineLength) {
-                    if (isComment(text, i, definition, &CommentDefinition::singleLine)) {
+                    if (isComment(text, i, definition.singleLine)) {
                         cursor.setPosition(block.position() + i);
                         cursor.movePosition(QTextCursor::NextCharacter,
                                             QTextCursor::KeepAnchor,
@@ -254,14 +208,14 @@ void Utils::unCommentSelection(QPlainTextEdit *edit, const CommentDefinition &de
                     ++i;
                 }
             } else {
-                QString text = block.text();
+                const QString text = block.text();
                 foreach (QChar c, text) {
                     if (!c.isSpace()) {
-                        if (definition.isAfterWhiteSpaces())
+                        if (definition.isAfterWhiteSpaces)
                             cursor.setPosition(block.position() + text.indexOf(c));
                         else
                             cursor.setPosition(block.position());
-                        cursor.insertText(definition.singleLine());
+                        cursor.insertText(definition.singleLine);
                         break;
                     }
                 }
diff --git a/src/libs/utils/uncommentselection.h b/src/libs/utils/uncommentselection.h
index 511878bd411..a0cad994df5 100644
--- a/src/libs/utils/uncommentselection.h
+++ b/src/libs/utils/uncommentselection.h
@@ -45,26 +45,16 @@ class QTCREATOR_UTILS_EXPORT CommentDefinition
 public:
     CommentDefinition();
 
-    CommentDefinition &setAfterWhiteSpaces(const bool);
-    CommentDefinition &setSingleLine(const QString &singleLine);
-    CommentDefinition &setMultiLineStart(const QString &multiLineStart);
-    CommentDefinition &setMultiLineEnd(const QString &multiLineEnd);
-
-    bool isAfterWhiteSpaces() const;
-    const QString &singleLine() const;
-    const QString &multiLineStart() const;
-    const QString &multiLineEnd() const;
-
     bool hasSingleLineStyle() const;
     bool hasMultiLineStyle() const;
 
     void clearCommentStyles();
 
-private:
-    bool m_afterWhiteSpaces;
-    QString m_singleLine;
-    QString m_multiLineStart;
-    QString m_multiLineEnd;
+public:
+    bool isAfterWhiteSpaces;
+    QString singleLine;
+    QString multiLineStart;
+    QString multiLineEnd;
 };
 
 QTCREATOR_UTILS_EXPORT
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 885a6caa2eb..b8f9bd76325 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -211,8 +211,8 @@ QtcLibrary {
         ]
     }
 
-    ProductModule {
-        // ### [ remove, once qbs supports merging of ProductModule items in derived products
+    Export {
+        // ### [ remove, once qbs supports merging of Export items in derived products
         Depends { name: "cpp" }
         cpp.includePaths: [ ".." ]
         // ### ]