Merge remote-tracking branch 'origin/4.3' into 4.4

Conflicts:
	src/plugins/qmlprofiler/qmlprofilertraceview.cpp

Change-Id: Ib1d75a8572f650898cb598d008867e2c0514d752

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml

@@ -130,8 +130,6 @@ Item {
                     exportMenuItem.enabled = !backendValue.isAttachedProperty()
                 }
 
-                onAboutToHide: menuLoader.active = false
-
                 Controls.MenuItem {
                     text: qsTr("Reset")
                     onTriggered: {

src/plugins/qmlprofiler/qmlprofiler.qbs

@@ -92,6 +92,7 @@ QtcPlugin {
             "qmlprofilerbindingloopsrenderpass_test.h",
             "qmlprofilerclientmanager_test.cpp", "qmlprofilerclientmanager_test.h",
             "qmlprofilerconfigwidget_test.cpp", "qmlprofilerconfigwidget_test.h",
+            "qmlprofilertraceview_test.cpp", "qmlprofilertraceview_test.h",
         ]
     }
 }

src/plugins/qmlprofiler/qmlprofilerplugin.cpp

@@ -48,6 +48,7 @@
 #include "tests/qmlprofilerbindingloopsrenderpass_test.h"
 #include "tests/qmlprofilerclientmanager_test.h"
 #include "tests/qmlprofilerconfigwidget_test.h"
+#include "tests/qmlprofilertraceview_test.h"
 
 // Force QML Debugging to be enabled, so that we can selftest the profiler
 #define QT_QML_DEBUG_NO_WARNING
@@ -141,6 +142,7 @@ QList<QObject *> QmlProfiler::Internal::QmlProfilerPlugin::createTestObjects() c
     tests << new QmlProfilerBindingLoopsRenderPassTest;
     tests << new QmlProfilerClientManagerTest;
     tests << new QmlProfilerConfigWidgetTest;
+    tests << new QmlProfilerTraceViewTest;
 
     tests << new QQmlEngine; // Trigger debug connector to be started
 #endif

src/plugins/qmlprofiler/qmlprofilertraceview.cpp

@@ -115,13 +115,16 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerViewManag
             break;
         case QmlProfilerModelManager::ClearingData:
             d->m_zoomControl->clear();
-            if (!d->m_suspendedModels.isEmpty())
-                break; // Models are suspended already. AcquiringData was aborted.
             Q_FALLTHROUGH();
         case QmlProfilerModelManager::AcquiringData:
-            // Temporarily remove the models, while we're changing them
+            if (d->m_suspendedModels.isEmpty()) {
-            d->m_suspendedModels = d->m_modelProxy->models();
+                // Temporarily remove the models, while we're changing them
-            d->m_modelProxy->setModels(QVariantList());
+                d->m_suspendedModels = d->m_modelProxy->models();
+                d->m_modelProxy->setModels(QVariantList());
+            }
+            // Otherwise models are suspended already. This can happen if either acquiring was
+            // aborted or we're doing a "restrict to range" which consists of a partial clearing and
+            // then re-acquiring of data.
             break;
         }
     });
@@ -309,6 +312,11 @@ bool QmlProfilerTraceView::isUsable() const
 #endif
 }
 
+bool QmlProfilerTraceView::isSuspended() const
+{
+    return !d->m_suspendedModels.isEmpty();
+}
+
 void QmlProfilerTraceView::changeEvent(QEvent *e)
 {
     if (e->type() == QEvent::EnabledChange) {

src/plugins/qmlprofiler/qmlprofilertraceview.h

@@ -53,6 +53,7 @@ public:
     qint64 selectionEnd() const;
     void showContextMenu(QPoint position);
     bool isUsable() const;
+    bool isSuspended() const;
 
 public slots:
     void clear();

src/plugins/qmlprofiler/tests/qmlprofilertraceview_test.cpp

@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#include "qmlprofilertraceview_test.h"
+#include <QtTest>
+
+namespace QmlProfiler {
+namespace Internal {
+
+QmlProfilerTraceViewTest::QmlProfilerTraceViewTest(QObject *parent) :
+    QObject(parent), traceView(nullptr, nullptr, &modelManager)
+{
+}
+
+void QmlProfilerTraceViewTest::testStateChanges()
+{
+    // Standard acquire-process-clear work flow
+    modelManager.startAcquiring();
+    QVERIFY(traceView.isSuspended());
+    modelManager.acquiringDone();
+    QVERIFY(!traceView.isSuspended());
+    modelManager.clear();
+    QVERIFY(!traceView.isSuspended());
+
+    // Restrict to range
+    modelManager.startAcquiring();
+    QVERIFY(traceView.isSuspended());
+    modelManager.acquiringDone();
+    QVERIFY(!traceView.isSuspended());
+    modelManager.restrictToRange(10, 14);
+    QVERIFY(!traceView.isSuspended());
+    modelManager.restrictToRange(-1, -1);
+    QVERIFY(!traceView.isSuspended());
+    modelManager.clear();
+    QVERIFY(!traceView.isSuspended());
+
+    // Abort Acquiring
+    modelManager.startAcquiring();
+    QVERIFY(traceView.isSuspended());
+    modelManager.clear();
+    QVERIFY(!traceView.isSuspended());
+}
+
+} // namespace Internal
+} // namespace QmlProfiler

src/plugins/qmlprofiler/tests/qmlprofilertraceview_test.h

@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#pragma once
+
+#include <qmlprofiler/qmlprofilermodelmanager.h>
+#include <qmlprofiler/qmlprofilertraceview.h>
+
+#include <QObject>
+
+namespace QmlProfiler {
+namespace Internal {
+
+class QmlProfilerTraceViewTest : public QObject
+{
+    Q_OBJECT
+public:
+    explicit QmlProfilerTraceViewTest(QObject *parent = nullptr);
+
+private slots:
+    void testStateChanges();
+
+private:
+    QmlProfilerModelManager modelManager;
+    QmlProfilerTraceView traceView;
+};
+
+} // namespace Internal
+} // namespace QmlProfiler

src/plugins/qmlprofiler/tests/tests.pri

@@ -14,7 +14,8 @@ SOURCES += \
     $$PWD/qmlprofilerattachdialog_test.cpp \
     $$PWD/qmlprofilerbindingloopsrenderpass_test.cpp \
     $$PWD/qmlprofilerclientmanager_test.cpp \
-    $$PWD/qmlprofilerconfigwidget_test.cpp
+    $$PWD/qmlprofilerconfigwidget_test.cpp \
+    $$PWD/qmlprofilertraceview_test.cpp
 
 HEADERS += \
     $$PWD/debugmessagesmodel_test.h \
@@ -32,4 +33,5 @@ HEADERS += \
     $$PWD/qmlprofilerattachdialog_test.h \
     $$PWD/qmlprofilerbindingloopsrenderpass_test.h \
     $$PWD/qmlprofilerclientmanager_test.h \
-    $$PWD/qmlprofilerconfigwidget_test.h
+    $$PWD/qmlprofilerconfigwidget_test.h \
+    $$PWD/qmlprofilertraceview_test.h