Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

alethzero/DownloadView.cpp

@@ -52,7 +52,10 @@ void DownloadView::paintEvent(QPaintEvent*)
 	QPointF pos(0, 0);
 
 	auto bg = m_man->blocksGot();
-
+	unsigned subCount = m_man->subCount();
+	if (subCount == 0)
+		return;
+	unsigned dh = 360 / subCount;
 	for (unsigned i = bg.all().first, ei = bg.all().second; i < ei; ++i)
 	{
 		int s = -2;
@@ -68,7 +71,6 @@ void DownloadView::paintEvent(QPaintEvent*)
 				h++;
 			});
 		}
-		unsigned dh = 360 / m_man->subCount();
 		if (s == -2)
 			p.fillRect(QRectF(QPointF(pos) + QPointF(3 * area.width() / 8, 3 * area.height() / 8), area / 4), Qt::black);
 		else if (s == -1)

mix/qml/Debugger.qml

@@ -4,7 +4,6 @@ import QtQuick.Controls.Styles 1.1
 import QtQuick.Dialogs 1.1
 import QtQuick.Layouts 1.1
 import Qt.labs.settings 1.0
-import QtGraphicalEffects 1.0
 import "js/Debugger.js" as Debugger
 import "js/ErrorLocationFormater.js" as ErrorLocationFormater
 import "."

mix/qml/StatesComboBox.qml

@@ -23,7 +23,6 @@
 import QtQuick 2.0
 import QtQuick.Controls 1.0
 import QtQuick.Layouts 1.1
-import QtGraphicalEffects 1.0
 import org.ethereum.qml.InverseMouseArea 1.0
 
 Rectangle {

mix/qml/StatusPane.qml

@@ -3,7 +3,6 @@ import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 import QtQuick.Controls.Styles 1.3
 import org.ethereum.qml.InverseMouseArea 1.0
-import QtGraphicalEffects 1.0
 import "js/ErrorLocationFormater.js" as ErrorLocationFormater
 import "."