Merge branch 'master' of github.com:Sankore/Sankore-3.1

src/adaptors/UBSvgSubsetAdaptor.cpp

@@ -1896,7 +1896,7 @@ void UBSvgSubsetAdaptor::UBSvgSubsetReader::graphicsItemFromSvg(QGraphicsItem* g
     {
         if (!svgX.isNull() && !svgY.isNull())
         {
-            #ifndef Q_WS_X11
+            #ifdef Q_WS_WIN
                 gItem->setPos(svgX.toString().toFloat(), svgY.toString().toFloat());
             #endif
         }

src/tools/UBGraphicsCompass.cpp

@@ -361,7 +361,7 @@ void UBGraphicsCompass::paintAngleDisplay(QPainter *painter)
     qreal angle = angleInDegrees();
 
     qreal angleValue = mDrawing ? - mSpanAngleInDegrees : angle;
-    QString angleText = QString("%1").arg(angleValue, 0, 'f', 1) + "°";
+    QString angleText = QString("%1").arg(angleValue, 0, 'f', 1) + "°";
 
     painter->save();
     painter->setFont(font());

src/tools/UBGraphicsProtractor.cpp

@@ -508,7 +508,7 @@ void UBGraphicsProtractor::paintAngleMarker(QPainter *painter)
 
     if (angle != 0)
     {
-        QString ang = QString("%1°").arg(angle,0, 'f', 1);
+        QString ang = QString("%1?°").arg(angle,0, 'f', 1);
         QFont font2 = painter->font();
         font2.setBold(true);
         QFontMetricsF fm2(font2);