From d84c367db598bc7a3ff1cf0a6e2ea00f3946d0cf Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Tue, 31 Dec 2013 19:58:21 +0200 Subject: [PATCH] Fix compilation with Qt 4.7. Closes #1215. --- src/statsdialog.cpp | 16 ++++++++++++ src/statsdialog.ui | 60 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 64 insertions(+), 12 deletions(-) diff --git a/src/statsdialog.cpp b/src/statsdialog.cpp index 9196bab98..9e4195fc2 100644 --- a/src/statsdialog.cpp +++ b/src/statsdialog.cpp @@ -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(); diff --git a/src/statsdialog.ui b/src/statsdialog.ui index 7829b15dc..ff188574d 100644 --- a/src/statsdialog.ui +++ b/src/statsdialog.ui @@ -34,11 +34,14 @@ - + TextLabel + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -48,18 +51,24 @@ - + TextLabel + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + TextLabel + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -69,11 +78,14 @@ - + TextLabel + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -83,11 +95,14 @@ - + TextLabel + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -106,18 +121,24 @@ - + TextLabel + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + TextLabel + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -136,32 +157,44 @@ Performance statistics - + TextLabel + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + TextLabel + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + TextLabel + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + TextLabel + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -199,11 +232,14 @@ - + TextLabel + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter +