Fix compilation with Qt 4.7. Closes #1215.

This commit is contained in:
sledgehammer999 2013-12-31 19:58:21 +02:00
commit d84c367db5
2 changed files with 64 additions and 12 deletions

View file

@ -46,6 +46,22 @@ ui->labelQueuedJobsText->setVisible(false);
ui->labelQueuedJobs->setVisible(false);
ui->labelJobsTimeText->setVisible(false);
ui->labelJobsTime->setVisible(false);
#endif
#if QT_VERSION < QT_VERSION_CHECK(4, 8, 0)
ui->labelAlltimeDL->setAlignment(Qt::AlignRight);
ui->labelAlltimeUL->setAlignment(Qt::AlignRight);
ui->labelWaste->setAlignment(Qt::AlignRight);
ui->labelGlobalRatio->setAlignment(Qt::AlignRight);
ui->labelPeers->setAlignment(Qt::AlignRight);
ui->labelCacheHits->setAlignment(Qt::AlignRight);
ui->labelTotalBuf->setAlignment(Qt::AlignRight);
#if LIBTORRENT_VERSION_NUM >= 001600
ui->labelWriteStarve->setAlignment(Qt::AlignRight);
ui->labelReadStarve->setAlignment(Qt::AlignRight);
ui->labelQueuedJobs->setAlignment(Qt::AlignRight);
ui->labelJobsTime->setAlignment(Qt::AlignRight);
#endif
ui->labelQueuedBytes->setAlignment(Qt::AlignRight);
#endif
session = QBtSession::instance();
updateUI();

View file

@ -34,11 +34,14 @@
</property>
</widget>
</item>
<item row="11" column="1" alignment="Qt::AlignRight">
<item row="11" column="1">
<widget class="QLabel" name="labelPeers">
<property name="text">
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="0">
@ -48,18 +51,24 @@
</property>
</widget>
</item>
<item row="1" column="1" alignment="Qt::AlignRight">
<item row="1" column="1">
<widget class="QLabel" name="labelAlltimeUL">
<property name="text">
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="1" alignment="Qt::AlignRight">
<item row="0" column="1">
<widget class="QLabel" name="labelAlltimeDL">
<property name="text">
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="0">
@ -69,11 +78,14 @@
</property>
</widget>
</item>
<item row="3" column="1" alignment="Qt::AlignRight">
<item row="3" column="1">
<widget class="QLabel" name="labelGlobalRatio">
<property name="text">
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="0">
@ -83,11 +95,14 @@
</property>
</widget>
</item>
<item row="2" column="1" alignment="Qt::AlignRight">
<item row="2" column="1">
<widget class="QLabel" name="labelWaste">
<property name="text">
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
@ -106,18 +121,24 @@
</property>
</widget>
</item>
<item row="1" column="1" alignment="Qt::AlignRight">
<item row="1" column="1">
<widget class="QLabel" name="labelCacheHits">
<property name="text">
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="1" alignment="Qt::AlignRight">
<item row="2" column="1">
<widget class="QLabel" name="labelTotalBuf">
<property name="text">
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="0">
@ -136,32 +157,44 @@
<string>Performance statistics</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="3" column="1" alignment="Qt::AlignRight">
<item row="3" column="1">
<widget class="QLabel" name="labelJobsTime">
<property name="text">
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="1" alignment="Qt::AlignRight">
<item row="2" column="1">
<widget class="QLabel" name="labelQueuedJobs">
<property name="text">
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="1" alignment="Qt::AlignRight">
<item row="0" column="1">
<widget class="QLabel" name="labelWriteStarve">
<property name="text">
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="1" alignment="Qt::AlignRight">
<item row="1" column="1">
<widget class="QLabel" name="labelReadStarve">
<property name="text">
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="0">
@ -199,11 +232,14 @@
</property>
</widget>
</item>
<item row="4" column="1" alignment="Qt::AlignRight">
<item row="4" column="1">
<widget class="QLabel" name="labelQueuedBytes">
<property name="text">
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>