From 0c0662711e7cd8443d3802edd022a7025468b73b Mon Sep 17 00:00:00 2001 From: Romolo Manfredini Date: Sun, 19 Jan 2014 08:10:28 +0100 Subject: [PATCH] Revert to old renderer --- companion/src/CMakeLists.txt | 1 - companion/src/contributorsdialog.cpp | 12 ++++++------ companion/src/contributorsdialog.ui | 19 +++---------------- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 593443103..6769e9337 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -39,7 +39,6 @@ ENDIF() FIND_PACKAGE( Qt4 REQUIRED ) SET( QT_USE_QTNETWORK True ) SET( QT_USE_QTXML True ) -SET( QT_USE_QTWEBKIT True ) INCLUDE( ${QT_USE_FILE} ) IF ( APPLE ) diff --git a/companion/src/contributorsdialog.cpp b/companion/src/contributorsdialog.cpp index 5a1cb0e1e..598076771 100644 --- a/companion/src/contributorsdialog.cpp +++ b/companion/src/contributorsdialog.cpp @@ -70,8 +70,8 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu str.append(""+tr("Thank you all !!!")+""); str.append(""); str.append(""); - ui->webBrowser->setHtml(str,QUrl("")); - ui->webBrowser->scroll(0,0); + ui->textEditor->setHtml(str); + ui->textEditor->scroll(0,0); this->setWindowTitle(tr("Contributors")); } break; @@ -79,9 +79,9 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu case 1:{ QFile file(":/releasenotes.txt"); if(file.open( QIODevice::ReadOnly | QIODevice::Text ) ) { - ui->webBrowser->setHtml(file.readAll(),QUrl("")); + ui->textEditor->setHtml(file.readAll()); } - ui->webBrowser->scroll(0,0); + ui->textEditor->scroll(0,0); this->setWindowTitle(tr("Companion9x Release Notes")); } break; @@ -104,7 +104,7 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu void contributorsDialog::showEvent ( QShowEvent * ) { - ui->webBrowser->scroll(0,0); + ui->textEditor->scroll(0,0); } contributorsDialog::~contributorsDialog() @@ -114,7 +114,7 @@ contributorsDialog::~contributorsDialog() void contributorsDialog::replyFinished(QNetworkReply * reply) { - ui->webBrowser->setHtml(reply->readAll(),QUrl("")); + ui->textEditor->setHtml(reply->readAll()); } void contributorsDialog::forceClose() { diff --git a/companion/src/contributorsdialog.ui b/companion/src/contributorsdialog.ui index 28fc29060..f50e0fe0d 100644 --- a/companion/src/contributorsdialog.ui +++ b/companion/src/contributorsdialog.ui @@ -6,8 +6,8 @@ 0 0 - 926 - 333 + 788 + 528 @@ -19,23 +19,10 @@ - - - - about:blank - - - + - - - QWebView - QWidget -
QtWebKit/QWebView
-
-