From 08c19700f5fac3f758a8f17376d5ccf307938e43 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 19 Oct 2009 11:48:33 +0200 Subject: Fixing rebase... --- src/previewimage.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/previewimage.cpp') diff --git a/src/previewimage.cpp b/src/previewimage.cpp index 42b275b2..b51631af 100644 --- a/src/previewimage.cpp +++ b/src/previewimage.cpp @@ -69,7 +69,7 @@ PreviewImage::PreviewImage(const QUrl &url, const QString &title, int index, boo setLayout(mainLayout); loadUrlPreview(url); - setAlignment(Qt::AlignCenter); +// setAlignment(Qt::AlignCenter); } @@ -123,13 +123,8 @@ void PreviewImage::snapFinished() loadingSnapshot = false; QMovie *m = m_imageLabel->movie(); delete m; -<<<<<<< HEAD - setMovie(0); - -======= m_imageLabel->setMovie(0); ->>>>>>> STEP 1 m_pixmap = ws->previewImage(); m_imageLabel->setPixmap(m_pixmap); m_textLabel->setText(m_title); -- cgit v1.2.1