[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kanagram] /: Remove webkit dependency and comment out WikiPage for this release.
From:       Jeremy Whiting <jpwhiting () kde ! org>
Date:       2014-10-31 20:33:22
Message-ID: E1XkIss-000867-V5 () scm ! kde ! org
[Download RAW message or body]

Git commit 57843b12b8e65349a648dd8e01404895c8a025ea by Jeremy Whiting.
Committed on 30/10/2014 at 17:42.
Pushed by whiting into branch 'master'.

Remove webkit dependency and comment out WikiPage for this release.
REVIEW:120906

M  +1    -1    CMakeLists.txt
M  +0    -1    src/CMakeLists.txt
M  +7    -7    src/ui/main.qml

http://commits.kde.org/kanagram/57843b12b8e65349a648dd8e01404895c8a025ea

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38a5660..a5d6a3b 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ if(NOT MSVC)
 endif(NOT MSVC)
 =

 include(FeatureSummary)
-find_package(Qt5 REQUIRED COMPONENTS Core Qml Quick OpenGL WebKit)
+find_package(Qt5 REQUIRED COMPONENTS Core Qml Quick OpenGL)
 find_package(Qt5 OPTIONAL_COMPONENTS PrintSupport)
 =

 find_package(ECM 0.0.9 NO_MODULE REQUIRED)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2b6940f..2088387 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,7 +29,6 @@ add_executable(kanagram ${kanagram_SRCS})
 target_link_libraries(kanagram
     Qt5::Quick
     Qt5::Core
-    Qt5::WebKit
     KF5::I18n
     KF5::NewStuff
     KF5::SonnetCore
diff --git a/src/ui/main.qml b/src/ui/main.qml
index 5d41ef5..38408ae 100755
--- a/src/ui/main.qml
+++ b/src/ui/main.qml
@@ -704,11 +704,11 @@ Rectangle {
         }
     }
 =

-    WikiPage {
-        id: wikiPage
-        visible: false
-        onClosed: {
-            blackboard.wikiClosed()
-        }
-    }
+//    WikiPage {
+//        id: wikiPage
+//        visible: false
+//        onClosed: {
+//            blackboard.wikiClosed()
+//        }
+//    }
 }
[prev in list] [next in list] [prev in thread] [next in thread]