Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dependency cleanups for Tide 1.5 #212

Merged
merged 3 commits into from
Nov 14, 2017
Merged

Dependency cleanups for Tide 1.5 #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a7468e
Silence tide launch script (only print command on request)
Nov 13, 2017
ba41639
Use std::shared_ptr everywhere (replaced boost::shared_ptr)
Nov 13, 2017
5208ad3
Remove legacy Qt5::WebKitWidgets webbrowser (Qt < 5.6)
Nov 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ set(TIDE_PORT_DEPENDS boost ffmpeg mpich-devel qt5)

include(Common)

common_find_package(Boost REQUIRED COMPONENTS program_options serialization
common_find_package(Boost 1.56 REQUIRED COMPONENTS program_options serialization
unit_test_framework)
common_find_package(Deflect 0.14 REQUIRED)
common_find_package(MPI REQUIRED)
Expand All @@ -39,12 +39,13 @@ endif()
common_find_package(Qt5Network REQUIRED)
common_find_package(Qt5Qml REQUIRED)
common_find_package(Qt5Quick 5.4 REQUIRED)
common_find_package(Qt5SerialPort)
if(TARGET Qt5::SerialPort)
option(TIDE_ENABLE_PLANAR_CONTROLLER "Enable Planar screen control" ON)
endif()
common_find_package(Qt5Svg REQUIRED)
common_find_package(Qt5WebEngine 5.6)
if(NOT TARGET Qt5::WebEngine)
common_find_package(Qt5WebKitWidgets SYSTEM)
endif()
if(TARGET Qt5::WebEngine OR TARGET Qt5::WebKitWidgets)
if(TARGET Qt5::WebEngine)
option(TIDE_ENABLE_WEBBROWSER_SUPPORT "Enable webbrowser support" ON)
endif()
common_find_package(Qt5Widgets REQUIRED)
Expand All @@ -57,7 +58,7 @@ common_find_package(RSVG MODULE librsvg-2.0 2.36.2)
common_find_package(Threads REQUIRED)
common_find_package(TIFF)
common_find_package(VirtualKeyboard)
common_find_package(X11) # for webbrowser and swap sync unit tests
common_find_package(X11) # for swap sync unit tests

common_find_package(FFMPEG)
if(FFMPEG_FOUND)
Expand All @@ -80,11 +81,6 @@ if(TARGET ZeroEQHTTP)
option(TIDE_ENABLE_REST_INTERFACE "Enable REST interface using ZeroEQ" ON)
endif()

common_find_package(Qt5SerialPort)
if(TARGET Qt5::SerialPort)
option(TIDE_ENABLE_PLANAR_CONTROLLER "Enable Planar screen control" ON)
endif()

common_find_package_post()

option(TIDE_IGNORE_MPI_THREADSAFETY "Ignore MPI_THREAD_MULITPLE requirement (Ubuntu 14.04)" OFF)
Expand Down
10 changes: 2 additions & 8 deletions apps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,8 @@ endforeach()
add_dependencies(tide tideForker tideMaster tideWall tideLauncher tideWhiteboard)

if(TIDE_ENABLE_WEBBROWSER_SUPPORT)
if(TARGET Qt5::WebKitWidgets)
add_subdirectory(LocalStreamer)
add_dependencies(tide tideLocalstreamer)
endif()
if(TARGET Qt5::WebEngine)
add_subdirectory(Webbrowser)
add_dependencies(tide tideWebbrowser)
endif()
add_subdirectory(Webbrowser)
add_dependencies(tide tideWebbrowser)
endif()

# Copy the default config to the share folder to be able to launch after
Expand Down
142 changes: 0 additions & 142 deletions apps/LocalStreamer/Application.cpp
View file
Open in desktop

This file was deleted.

89 changes: 0 additions & 89 deletions apps/LocalStreamer/Application.h
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions apps/LocalStreamer/CMakeLists.txt
View file
Open in desktop

This file was deleted.

69 changes: 0 additions & 69 deletions apps/LocalStreamer/main.cpp
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions apps/Webbrowser/Webbrowser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,7 @@ void Webbrowser::_sendData()
{
const auto history = _getNavigationHistory(_webengine);
const auto title = QQmlProperty::read(_webengine, "title").toString();
const auto restPort = 0; // no rest interface
const auto data =
WebbrowserContent::serializeData(history, title, restPort);
const auto data = WebbrowserContent::serializeData(history, title);
if (!_qmlStreamer->sendData(data))
QGuiApplication::quit();
}
Expand Down
Loading