feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: I790a8b9002a55f52090d085b65d9fe58b7eb1d20
This commit is contained in:
Eike Ziller
2020-11-16 11:26:03 +01:00
parent ab324a626c 9ff91ef0d9
commit 4498c12ddc
106 changed files with 4591 additions and 3314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/autotest/testnavigationwidget.cpp
View File

@@ -118,6 +118,8 @@ TestNavigationWidget::TestNavigationWidget(QWidget *parent) :
this, &TestNavigationWidget::reapplyCachedExpandedState);
connect(m_progressTimer, &QTimer::timeout,
m_progressIndicator, &Utils::ProgressIndicator::show);
connect(m_view, &TestTreeView::expanded, this, &TestNavigationWidget::updateExpandedStateCache);
connect(m_view, &TestTreeView::collapsed, this, &TestNavigationWidget::updateExpandedStateCache);
}
void TestNavigationWidget::contextMenuEvent(QContextMenuEvent *event)
@@ -230,8 +232,18 @@ QList<QToolButton *> TestNavigationWidget::createToolButtons()
collapse->setIcon(Utils::Icons::COLLAPSE_TOOLBAR.icon());
collapse->setToolTip(tr("Collapse All"));
connect(expand, &QToolButton::clicked, m_view, &TestTreeView::expandAll);
connect(collapse, &QToolButton::clicked, m_view, &TestTreeView::collapseAll);
connect(expand, &QToolButton::clicked, m_view, [this]() {
m_view->blockSignals(true);
m_view->expandAll();
m_view->blockSignals(false);
updateExpandedStateCache();
});
connect(collapse, &QToolButton::clicked, m_view, [this]() {
m_view->blockSignals(true);
m_view->collapseAll();
m_view->blockSignals(false);
updateExpandedStateCache();
});
connect(m_sort, &QToolButton::clicked, this, &TestNavigationWidget::onSortClicked);
list << m_filterButton << m_sort << expand << collapse;

3
src/plugins/qmldesigner/components/componentcore/theme.h
View File

@@ -99,6 +99,8 @@ public:
distributeSpacingVertical,
distributeTop,
edit,
flowAction,
flowTransition,
fontStyleBold,
fontStyleItalic,
fontStyleStrikethrough,
@@ -115,6 +117,7 @@ public:
plus,
redo,
rotation,
search,
splitColumns,
splitRows,
startNode,

8
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -973,7 +973,7 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
{
qCInfo(rewriterBenchmark) << Q_FUNC_INFO;
const bool justSanityCheck = !differenceHandler.isValidator();
const bool justSanityCheck = !differenceHandler.isAmender();
QElapsedTimer time;
if (rewriterBenchmark().isInfoEnabled())
@@ -1135,10 +1135,10 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
}
if (isComponentType(typeName) || isImplicitComponent)
setupComponentDelayed(modelNode, differenceHandler.isValidator());
setupComponentDelayed(modelNode, differenceHandler.isAmender());
if (isCustomParserType(typeName))
setupCustomParserNodeDelayed(modelNode, differenceHandler.isValidator());
setupCustomParserNodeDelayed(modelNode, differenceHandler.isAmender());
context->enterScope(astNode);
@@ -1245,7 +1245,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
if (!defaultPropertyItems.isEmpty()) {
if (isComponentType(modelNode.type()))
setupComponentDelayed(modelNode, differenceHandler.isValidator());
setupComponentDelayed(modelNode, differenceHandler.isAmender());
if (defaultPropertyName.isEmpty()) {
qWarning() << "No default property for node type" << modelNode.type() << ", ignoring child items.";
} else {

6
src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
View File

@@ -210,7 +210,7 @@ public:
ReadingContext *context) = 0;
virtual void propertyAbsentFromQml(AbstractProperty &modelProperty) = 0;
virtual void idsDiffer(ModelNode &modelNode, const QString &qmlId) = 0;
virtual bool isValidator() const = 0;
virtual bool isAmender() const = 0;
protected:
TextToModelMerger *m_merger;
@@ -262,7 +262,7 @@ public:
ReadingContext *context) override;
void propertyAbsentFromQml(AbstractProperty &modelProperty) override;
void idsDiffer(ModelNode &modelNode, const QString &qmlId) override;
bool isValidator() const override {return false; }
bool isAmender() const override {return false; }
};
class ModelAmender: public DifferenceHandler
@@ -311,7 +311,7 @@ public:
ReadingContext *context) override;
void propertyAbsentFromQml(AbstractProperty &modelProperty) override;
void idsDiffer(ModelNode &modelNode, const QString &qmlId) override;
bool isValidator() const override {return true; }
bool isAmender() const override {return true; }
};
} //Internal

4
src/plugins/qmlprofiler/tests/flamegraphview_test.cpp
View File

@@ -64,7 +64,7 @@ void FlameGraphViewTest::testSelection()
});
QSignalSpy spy(&view, SIGNAL(typeSelected(int)));
QTest::mouseClick(view.childAt(250, 250), Qt::LeftButton, Qt::NoModifier, QPoint(5, 495));
QTest::mouseClick(view.childAt(250, 250), Qt::LeftButton, Qt::NoModifier, QPoint(15, 485));
if (spy.isEmpty())
QVERIFY(spy.wait());
@@ -74,7 +74,7 @@ void FlameGraphViewTest::testSelection()
// Click in empty area deselects
expectedType = -1;
QTest::mouseClick(view.childAt(250, 250), Qt::LeftButton, Qt::NoModifier, QPoint(495, 50));
QTest::mouseClick(view.childAt(250, 250), Qt::LeftButton, Qt::NoModifier, QPoint(485, 50));
QCOMPARE(spy.count(), 2);
view.onVisibleFeaturesChanged(1 << ProfileBinding);