Merge remote-tracking branch 'origin/2.6'

Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/3rdparty/botan/botan.qbs
	src/libs/ssh/ssh.qbs
	src/plugins/qnx/blackberryqtversion.cpp

Change-Id: Ie8d16d636528aab4006310eab47a342fdf2634d9

src/plugins/qmlprofiler/qml/RangeDetails.qml

@@ -55,6 +55,28 @@ Item {
     property int relativey : y - yoffset
     onYChanged: relativey = y - yoffset
 
+    // keep inside view
+    Connections {
+        target: root
+        onWidthChanged: fitInView();
+        onCandidateHeightChanged: fitInView();
+    }
+
+    function fitInView() {
+        // don't reposition if it does not fit
+        if (root.width < width || root.candidateHeight < height)
+            return;
+
+        if (x + width > root.width)
+            x = root.width - width;
+        if (x < 0)
+            x = 0;
+        if (y + height > root.candidateHeight)
+            y = root.candidateHeight - height;
+        if (y < 0)
+            y = 0;
+    }
+
     // shadow
     BorderImage {
         property int px: 4
@@ -163,6 +185,10 @@ Item {
         width: col.width + 45
         height: col.height + 30
         drag.target: parent
+        drag.minimumX: 0
+        drag.maximumX: root.width - parent.width
+        drag.minimumY: 0
+        drag.maximumY: root.candidateHeight - parent.height
         onClicked: {
             root.gotoSourceLocation(file, line, column);
             root.recenterOnItem(view.selectedItem);

src/plugins/qmlprofiler/qml/SelectionRangeDetails.qml

@@ -50,6 +50,28 @@ Item {
     property int relativey : y - yoffset
     onYChanged: relativey = y - yoffset
 
+    // keep inside view
+    Connections {
+        target: root
+        onWidthChanged: fitInView();
+        onCandidateHeightChanged: fitInView();
+    }
+
+    function fitInView() {
+        // don't reposition if it does not fit
+        if (root.width < width || root.candidateHeight < height)
+            return;
+
+        if (x + width > root.width)
+            x = root.width - width;
+        if (x < 0)
+            x = 0;
+        if (y + height > root.candidateHeight)
+            y = root.candidateHeight - height;
+        if (y < 0)
+            y = 0;
+    }
+
     // shadow
     BorderImage {
         property int px: 4
@@ -134,6 +156,10 @@ Item {
         width: col.width + 45
         height: col.height + 30
         drag.target: parent
+        drag.minimumX: 0
+        drag.maximumX: root.width - parent.width
+        drag.minimumY: 0
+        drag.maximumY: root.candidateHeight - parent.height
         onClicked: {
             if ((selectionRange.x < flick.contentX) ^ (selectionRange.x+selectionRange.width > flick.contentX + flick.width)) {
                 root.recenter(selectionRange.startTime + selectionRange.duration/2);

src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp

@@ -290,6 +290,11 @@ void QmlProfilerDataModel::clear()
     setState(Empty);
 }
 
+void QmlProfilerDataModel::prepareForWriting()
+{
+    setState(AcquiringData);
+}
+
 void QmlProfilerDataModel::addRangedEvent(int type, int bindingType, qint64 startTime,
                                           qint64 length, const QStringList &data,
                                           const QmlDebug::QmlEventLocation &location)

src/plugins/qmlprofiler/qmlprofilerdatamodel.h

@@ -165,6 +165,7 @@ signals:
 public slots:
     void clear();
 
+    void prepareForWriting();
     void addRangedEvent(int type, int bindingType, qint64 startTime, qint64 length,
                         const QStringList &data, const QmlDebug::QmlEventLocation &location);
     void addV8Event(int depth,const QString &function,const QString &filename, int lineNumber, double totalTime, double selfTime);

src/plugins/qmlprofiler/qmlprofilertool.cpp

@@ -692,6 +692,7 @@ void QmlProfilerTool::profilerStateChanged()
     }
     case QmlProfilerStateManager::AppKilled : {
         showNonmodalWarning(tr("Application finished before loading profiled data.\nPlease use the stop button instead."));
+        d->m_profilerDataModel->clear();
         break;
     }
     case QmlProfilerStateManager::Idle :
@@ -720,6 +721,7 @@ void QmlProfilerTool::serverRecordingChanged()
         // clear the old data each time we start a new profiling session
         if (d->m_profilerState->serverRecording()) {
             clearData();
+            d->m_profilerDataModel->prepareForWriting();
         }
     }
 }