Browse Source

Remove WebKit.

cl-refactor
Gav Wood 10 years ago
parent
commit
aaae770f7a
  1. 2
      CMakeLists.txt
  2. 2
      alethzero/CMakeLists.txt
  3. 14
      alethzero/Main.ui
  4. 4
      cmake/EthDependencies.cmake

2
CMakeLists.txt

@ -212,7 +212,7 @@ if (NOT JUSTTESTS)
if (ETH_HAVE_WEBENGINE)
add_subdirectory(alethzero)
add_subdirectory(third)
# add_subdirectory(third) // reenable once not qtwebkit.
endif()
add_subdirectory(mix)

2
alethzero/CMakeLists.txt

@ -41,8 +41,6 @@ add_dependencies(${EXECUTABLE} BuildInfo.h)
target_link_libraries(${EXECUTABLE} Qt5::Core)
target_link_libraries(${EXECUTABLE} Qt5::Widgets)
target_link_libraries(${EXECUTABLE} Qt5::WebKit)
target_link_libraries(${EXECUTABLE} Qt5::WebKitWidgets)
target_link_libraries(${EXECUTABLE} Qt5::WebEngine)
target_link_libraries(${EXECUTABLE} Qt5::WebEngineWidgets)
target_link_libraries(${EXECUTABLE} webthree)

14
alethzero/Main.ui

@ -807,13 +807,7 @@
<number>0</number>
</property>
<item>
<widget class="QWebView" name="jsConsole">
<property name="url">
<url>
<string>about:blank</string>
</url>
</property>
</widget>
<widget class="QWebEngineView" name="jsConsole" native="true"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_9">
@ -1668,11 +1662,6 @@ font-size: 14pt</string>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>QWebView</class>
<extends>QWidget</extends>
<header>QtWebKitWidgets/QWebView</header>
</customwidget>
<customwidget>
<class>MiningView</class>
<extends>QWidget</extends>
@ -1702,7 +1691,6 @@ font-size: 14pt</string>
<tabstop>log</tabstop>
<tabstop>post</tabstop>
<tabstop>verbosity</tabstop>
<tabstop>jsConsole</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>urlEdit</tabstop>
<tabstop>idealPeers</tabstop>

4
cmake/EthDependencies.cmake

@ -120,8 +120,8 @@ if (NOT HEADLESS)
find_package (Qt5Qml REQUIRED)
find_package (Qt5Network REQUIRED)
find_package (Qt5Widgets REQUIRED)
find_package (Qt5WebKit REQUIRED)
find_package (Qt5WebKitWidgets REQUIRED)
find_package (Qt5WebEngine REQUIRED)
find_package (Qt5WebEngineWidgets REQUIRED)
# we need to find path to macdeployqt on mac
if (APPLE)

Loading…
Cancel
Save