[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=17e0c61

The following commit has been merged in the master branch:
commit 17e0c6192c139af2d6d7d57d5abbeef59cf7b37f
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sun Dec 25 02:54:55 2011 +0100

    Use KWebView instead of QWebView
---
 CMakeLists.txt                | 2 +-
 x-messenger-oauth2-prompt.cpp | 4 ++--
 x-messenger-oauth2-prompt.h   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32bbf84..f39eca3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,11 +44,11 @@ target_link_libraries(ktp-auth-handler
     ${QT_QTGUI_LIBRARY}
     ${QT_QTXML_LIBRARY}
     ${QT_QTCORE_LIBRARY}
-    ${QT_QTWEBKIT_LIBRARY}
     ${TELEPATHY_QT4_LIBRARIES}
     ${KTP_LIBRARIES}
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KDEUI_LIBS}
+    ${KDE4_KDEWEBKIT_LIBS}
 )
 
 configure_file(org.freedesktop.Telepathy.Client.KTp.SASLHandler.service.in
diff --git a/x-messenger-oauth2-prompt.cpp b/x-messenger-oauth2-prompt.cpp
index cf26208..c12ae89 100644
--- a/x-messenger-oauth2-prompt.cpp
+++ b/x-messenger-oauth2-prompt.cpp
@@ -22,8 +22,8 @@
 #include <KIcon>
 #include <KToolInvocation>
 #include <KDebug>
+#include <KWebView>
 
-#include <QtWebKit/QWebView>
 #include <QtWebKit/QWebSettings>
 #include <QtGui/QProgressBar>
 #include <QtGui/QBoxLayout>
@@ -36,7 +36,7 @@ const QLatin1String redirectUri("https://oauth.live.com/desktop");
 
 XMessengerOAuth2Prompt::XMessengerOAuth2Prompt(QWidget* parent) :
     KDialog(parent),
-    m_webView(new QWebView()),
+    m_webView(new KWebView()),
     m_ProgressBar(new QProgressBar()),
     m_loginPageLoaded(false)
 {
diff --git a/x-messenger-oauth2-prompt.h b/x-messenger-oauth2-prompt.h
index b3b2e06..d08d291 100644
--- a/x-messenger-oauth2-prompt.h
+++ b/x-messenger-oauth2-prompt.h
@@ -22,7 +22,7 @@
 #include <KDialog>
 
 class QProgressBar;
-class QWebView;
+class KWebView;
 class QNetworkReply;
 
 class XMessengerOAuth2Prompt : public KDialog
@@ -49,7 +49,7 @@ private Q_SLOTS:
     void onUnsupportedContent(QNetworkReply* reply);
 
 private:
-    QWebView *m_webView;
+    KWebView *m_webView;
     QProgressBar *m_ProgressBar;
     bool m_loginPageLoaded;
     QByteArray m_accessToken;

-- 
ktp-auth-handler packaging