1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
commit 54f92d12cccac60c378d114869762d1a3ad75435
Author: Radek Novacek <rnovacek at redhat.com>
Date: Fri May 4 13:04:48 2012 +0200
Don't use webkit on RHEL
k3b-2.0.2-no-webkit.patch | 53 +++++++++++++++++++++++++++++++++++++++++++++
k3b.spec | 11 +++++++-
2 files changed, 62 insertions(+), 2 deletions(-)
---
diff -up a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt 2012-05-04 12:30:46.634241618 +0200
+++ b/src/CMakeLists.txt 2012-05-04 12:30:56.980516383 +0200
@@ -287,7 +287,6 @@ target_link_libraries(k3b_bin
${KDE4_KUTILS_LIBS}
${KDE4_KDE3SUPPORT_LIBS}
${KDE4_SOLID_LIBS}
- ${QT_QTWEBKIT_LIBRARY}
${X11_LIBRARIES}
)
diff -up a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp
--- a/src/k3bdiskinfoview.cpp 2012-05-04 12:29:13.994781781 +0200
+++ b/src/k3bdiskinfoview.cpp 2012-05-04 13:10:07.748401670 +0200
@@ -34,7 +34,6 @@
#include <qpalette.h>
#include <qpixmap.h>
#include <QtGui/QTextBrowser>
-#include <QtWebKit/QWebView>
#include <klocale.h>
#include <kstandarddirs.h>
@@ -61,7 +60,7 @@ K3b::DiskInfoView::DiskInfoView( QWidget
Device::STATE_ALL|Device::STATE_NO_MEDIA|Device::STATE_UNKNOWN,
parent )
{
- m_infoView = new QWebView( this );
+ m_infoView = new QTextBrowser( this );
setMainWidget( m_infoView );
}
diff -up a/src/k3bdiskinfoview.h b/src/k3bdiskinfoview.h
--- a/src/k3bdiskinfoview.h 2012-05-04 12:50:25.753604831 +0200
+++ b/src/k3bdiskinfoview.h 2012-05-04 13:09:15.232985545 +0200
@@ -19,7 +19,7 @@
#include "k3bmediacontentsview.h"
-class QWebView;
+class QTextBrowser;
namespace K3b {
class DiskInfoView : public MediaContentsView
@@ -38,7 +38,7 @@ private:
QString createIso9660InfoItems( const Iso9660SimplePrimaryDescriptor& iso );
QString createTrackItems( const Medium& medium );
- QWebView* m_infoView;
+ QTextBrowser* m_infoView;
};
}
|
GitWeb
