diff options
author | jacobkeeler <jacob.keeler@livioradio.com> | 2018-02-01 10:42:03 -0500 |
---|---|---|
committer | jacobkeeler <jacob.keeler@livioradio.com> | 2018-02-01 11:09:08 -0500 |
commit | c1557903ddefeed660a581410442fe50490d1bb0 (patch) | |
tree | 5186af11272b58b2aad762164bdc6c7a052c9323 | |
parent | 3226d63c50103f5cc8a0aa326c646aaf272a54ba (diff) | |
download | sdl_core-c1557903ddefeed660a581410442fe50490d1bb0.tar.gz |
Remove references to QT HMIfeature/remove_qt_hmi
-rw-r--r-- | CMakeLists.txt | 43 | ||||
-rw-r--r-- | README.md | 1 | ||||
-rw-r--r-- | src/appMain/main.cc | 21 | ||||
-rw-r--r-- | src/components/interfaces/QT_HMI_API.xml | 7 |
4 files changed, 12 insertions, 60 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b8fd497a09..f005a16068 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,6 @@ include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/platform.cmake) #Jenkins integration section #dont modify this section if you dont know details about integration with Jenkins!!! set (HMI "web" CACHE STRING "HMI type") -option(HMI2 "Use Qt HMI" OFF) option(EXTENDED_MEDIA_MODE "Turn on and off extended Madia Manager features relates to PulseAudio A2DP and GStreamer" OFF) option(BUILD_SHARED_LIBS "Build all libraries as shared (if ON) or static (if OFF)" OFF) option(BUILD_BT_SUPPORT "Bluetooth support" ON) @@ -90,15 +89,12 @@ else () endif() if (HMI_TYPE_OPTION) - if (${HMI_TYPE_OPTION} STREQUAL "HTML5") - message(STATUS "Jenkins integration: select HTML5 HMI") - set (HMI "web") - elseif (${HMI_TYPE_OPTION} STREQUAL "NONE") + if (${HMI_TYPE_OPTION} STREQUAL "NONE") message(STATUS "Jenkins integration: select HMI none") set (HMI "no") else () - message(STATUS "Jenkins integration: select QML HMI none") - set (HMI "qt") + message(STATUS "Jenkins integration: select HTML5 HMI") + set (HMI "web") endif() endif() @@ -324,38 +320,10 @@ if (EXTENDED_MEDIA_MODE) add_definitions(${GLIB2_CFLAGS}) endif() -if(HMI STREQUAL "qt") - if(CMAKE_SYSTEM_NAME STREQUAL "QNX") - set(qt_version "4.8.5") - else() - set(qt_version "5.1.0") - endif() - - execute_process( - COMMAND ${CMAKE_SOURCE_DIR}/FindQt.sh -v ${qt_version} - OUTPUT_VARIABLE qt_bin_dir - ) - message(STATUS "Binary directory Qt ${qt_version} is ${qt_bin_dir}") - set(ENV{PATH} ${qt_bin_dir}:$ENV{PATH}) - - if(CMAKE_SYSTEM_NAME STREQUAL "QNX") - find_package(Qt4 ${qt_version} REQUIRED QtCore QtGui QtDBus QtDeclarative) - else () - find_package(Qt5Core REQUIRED) - find_package(Qt5DBus REQUIRED) - find_package(Qt5Qml REQUIRED) - find_package(Qt5Quick REQUIRED) - set(qmlplugindump_binary ${qt_bin_dir}/qmlplugindump) - endif() -endif() - # Building application # --- Type HMI -if (HMI STREQUAL "qt") - set(QT_HMI ON) - add_definitions(-DQT_HMI) -elseif (HMI STREQUAL "web") +if (HMI STREQUAL "web") set(WEB_HMI ON) add_definitions(-DWEB_HMI) else () @@ -363,9 +331,6 @@ else () add_definitions(-DNO_HMI) endif () -if (HMI STREQUAL "qt" AND NOT DEFINED HMIADAPTER) - set(HMIADAPTER "dbus") -endif() if (HMI STREQUAL "web" AND NOT DEFINED HMIADAPTER) set(HMIADAPTER "messagebroker") endif() @@ -65,7 +65,6 @@ The dependencies for SDL Core vary based on the configuration. You can change SD | Flag | Description | Dependencies | |------|-------------|--------------| |Web HMI|Use HTML5 HMI|chromium-browser| -|HMI2|Build with QT HMI|QT5, dbus-*dev| |EXTENDED_MEDIA_MODE|Support Video and Audio Streaming|Opengl es2, gstreamer1.0*| |Bluetooth|Enable bluetooth transport adapter|libbluetooth3, libbluetooth-dev, bluez-tools| |Testing framework|Needed to support running unit tests|libgtest-dev| diff --git a/src/appMain/main.cc b/src/appMain/main.cc index 81482c4335..5832163066 100644 --- a/src/appMain/main.cc +++ b/src/appMain/main.cc @@ -90,23 +90,6 @@ bool InitHmi(std::string hmi_link) { .Execute(); } #endif // WEB_HMI - -#ifdef QT_HMI -/** - * Initialize HTML based HMI. - * @return true if success otherwise false. - */ -bool InitHmi() { - std::string kStartHmi = "./start_hmi.sh"; - struct stat sb; - if (stat(kStartHmi.c_str(), &sb) == -1) { - LOG4CXX_FATAL(logger_, "HMI start script doesn't exist!"); - return false; - } - - return utils::System(kStartHmi).Execute(); -} -#endif // QT_HMI } /** @@ -178,13 +161,13 @@ int32_t main(int32_t argc, char** argv) { if (profile_instance.server_address() == kLocalHostAddress) { LOG4CXX_INFO(logger_, "Start HMI on localhost"); -#ifndef NO_HMI +#ifdef WEB_HMI if (!InitHmi(profile_instance.link_to_web_hmi())) { LOG4CXX_INFO(logger_, "InitHmi successful"); } else { LOG4CXX_WARN(logger_, "Failed to init HMI"); } -#endif // #ifndef NO_HMI +#endif } } // -------------------------------------------------------------------------- diff --git a/src/components/interfaces/QT_HMI_API.xml b/src/components/interfaces/QT_HMI_API.xml index 72076ca198..269031ddc9 100644 --- a/src/components/interfaces/QT_HMI_API.xml +++ b/src/components/interfaces/QT_HMI_API.xml @@ -1,6 +1,6 @@ <?xml version="1.0" standalone="yes"?> <!-- -* Copyright (c) 2013, Ford Motor Company + * Copyright (c) 2013, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,6 +29,11 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. --> + +<!-- + * DEPRECATED, use HMI_API instead. This API is used with the DBus adapter, + * which will be removed or refactored to use HMI_API in the next major release +--> <interfaces name="SmartDeviceLink HMI API"> <interface name="Common" version="1.1" date="2013-10-02"> <enum name="Result"> |