src/GUI/stylecombobox.cpp

@@ -13,18 +13,15 @@ static Qt::PenStyle styles[] = {Qt::SolidLine, Qt::DashLine, Qt::DotLine,
 
 QIcon StyleComboBox::icon(Qt::PenStyle style)
 {
-	qreal ratio(devicePixelRatioF());
+	QPixmap pm(iconSize());
-	QSize size(iconSize());
-	QPixmap pm(size * ratio);
-	pm.setDevicePixelRatio(ratio);
 	pm.fill(Qt::transparent);
 
 	QBrush brush(QPalette().brush(QPalette::Active, QPalette::WindowText));
-	QPen pen(brush, size.height() / LINE_WIDTH_RATIO, style);
+	QPen pen(brush, pm.height() / LINE_WIDTH_RATIO, style);
 
 	QPainter painter(&pm);
 	painter.setPen(pen);
-	painter.drawLine(0, size.height() / 2, size.width(), size.height() / 2);
+	painter.drawLine(0, pm.height() / 2, pm.width(), pm.height() / 2);
 
 	return QIcon(pm);
 }

src/data/data.cpp

@@ -106,7 +106,7 @@ Data::Data(const QString &fileName, bool tryUnknown)
 	_errorLine = 0;
 
 	if (!file.open(QFile::ReadOnly)) {
-		_errorString = file.errorString();
+		_errorString = qPrintable(file.errorString());
 		return;
 	}