Showing with 6 additions and 6 deletions.
  1. +5 −5 src/ui/qgsprojectpropertiesbase.ui
  2. +1 −1 tests/src/core/qgsrenderchecker.cpp
10 changes: 5 additions & 5 deletions src/ui/qgsprojectpropertiesbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@
<attribute name="title">
<string>General</string>
</attribute>
<layout class="QGridLayout">
<layout class="QGridLayout" name="gridLayout_25">
<item row="0" column="0">
<widget class="QGroupBox" name="titleBox">
<property name="title">
<string>General settings</string>
</property>
<layout class="QGridLayout">
<layout class="QGridLayout" name="gridLayout_26">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
Expand Down Expand Up @@ -196,7 +196,7 @@
<property name="title">
<string>Layer units (only used when CRS transformation is disabled)</string>
</property>
<layout class="QGridLayout">
<layout class="QGridLayout" name="gridLayout_27">
<item row="0" column="0">
<widget class="QRadioButton" name="radMeters">
<property name="text">
Expand Down Expand Up @@ -236,7 +236,7 @@
<property name="title">
<string>Precision</string>
</property>
<layout class="QGridLayout">
<layout class="QGridLayout" name="gridLayout_28">
<item row="0" column="0">
<widget class="QRadioButton" name="radAutomatic">
<property name="toolTip">
Expand Down Expand Up @@ -305,7 +305,7 @@
<attribute name="title">
<string>Coordinate Reference System (CRS)</string>
</attribute>
<layout class="QGridLayout">
<layout class="QGridLayout" name="gridLayout_29">
<property name="leftMargin">
<number>3</number>
</property>
Expand Down
2 changes: 1 addition & 1 deletion tests/src/core/qgsrenderchecker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ bool QgsRenderChecker::compareImages( QString theTestName,
myExpectedImage.height(),
QImage::Format_RGB32 );
QString myResultDiffImage = QDir::tempPath() + QDir::separator() +
"control_images" + QDir::separator() +
QDir::separator() +
theTestName + "_result_diff.png";
myDifferenceImage.fill( qRgb( 152, 219, 249 ) );

Expand Down