Apply code review comments

Fixed changed to .travis.yml
Restored build configuration defaults
Put back/remove files changed with refactoring
Reverted changes related to MSCV
Removed changes related to QT_PORT

Related taks APPLINK-30588 APPLINK-30972

5 files changed, 8 insertions, 23 deletions

diff --git a/.travis.yml b/.travis.yml
index 5c118102fb..6263b30767 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ only:
   - \/feature\/.+
   - \/fix\/.+
   - \/hotfix\/.+
+  - \/release\/.+
 
 addons:
   apt:
@@ -23,6 +24,7 @@ addons:
     - cmake
     - html2text
     - clang-format-3.6
+    - binutils
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get -q -y install libavahi-client-dev bluez-tools sqlite3 libsqlite3-dev automake1.11
@@ -56,10 +58,6 @@ deploy:
 notifications:
   email:
     - AKutsan@luxoft.com
-    - AByzhynar@luxoft.com
     - NSnitsar@luxoft.com
-    - RMalynovskyi@luxoft.com
     - MGhiumiusliu@luxoft.com
-    - AGaliuzov@luxoft.com
-    - ANosach@luxoft.com
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a4ae6509a..443164f565 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,9 +44,9 @@ option(EXTENDED_MEDIA_MODE "Turn on and off extended Madia Manager features rela
 option(BUILD_SHARED_LIBS "Build all libraries as shared (if ON) or static (if OFF)" OFF)
 option(BUILD_BT_SUPPORT "Bluetooth support" ON)
 option(BUILD_USB_SUPPORT "libusb support" ON)
-option(BUILD_BACKTRACE_SUPPORT "backtrace support" OFF)
-option(BUILD_TESTS "Possibility to build and run tests" ON)
-option(TELEMETRY_MONITOR "Enable profiling time test util" OFF)
+option(BUILD_BACKTRACE_SUPPORT "backtrace support" ON)
+option(BUILD_TESTS "Possibility to build and run tests" OFF)
+option(TELEMETRY_MONITOR "Enable profiling time test util" ON)
 option(ENABLE_LOG "Logging feature" ON)
 option(ENABLE_GCOV "gcov code coverage feature" OFF)
 option(ENABLE_SANITIZE "Sanitize tool" OFF)
@@ -240,14 +240,6 @@ endif()
 set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG -s -O2")
 set(CMAKE_CXX_FLAGS_DEBUG   " -DDEBUG -g3 -ggdb3")
 
-if(QT_PORT)
-  set(CMAKE_AUTOMOC ON)
-  find_package(Qt5 REQUIRED Core Network)
-  include_directories(
-    ${Qt5Core_INCLUDE_DIRS}
-    ${Qt5Network_INCLUDE_DIRS})
-endif ()
-
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
   add_definitions(-DOS_LINUX)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "QNX")
diff --git a/src/3rd_party/iap.armv7-qnx.runtime.tar.bz2 b/src/3rd_party/iap.armv7-qnx.runtime.tar.bz2
new file mode 100644
index 0000000000..3d6028c6ec
--- /dev/null
+++ b/src/3rd_party/iap.armv7-qnx.runtime.tar.bz2
diff --git a/src/components/application_manager/test/CMakeLists.txt b/src/components/application_manager/test/CMakeLists.txt
index a81aa162cb..49de6dbcc9 100644
--- a/src/components/application_manager/test/CMakeLists.txt
+++ b/src/components/application_manager/test/CMakeLists.txt
@@ -173,7 +173,6 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/resumption)
 file(COPY smartDeviceLink_test.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/resumption)
 create_test("resumption/data_resumption_test" "${ResumptionData_SOURCES}" "${testLibraries}")
 
-add_subdirectory(message_helper)
 add_subdirectory(state_controller)
 add_subdirectory(app_launch)
 add_subdirectory(commands)
diff --git a/src/components/application_manager/test/resumption/resume_ctrl_test.cc b/src/components/application_manager/test/resumption/resume_ctrl_test.cc
index b62830aeff..14f6cf58cd 100644
--- a/src/components/application_manager/test/resumption/resume_ctrl_test.cc
+++ b/src/components/application_manager/test/resumption/resume_ctrl_test.cc
@@ -49,10 +49,6 @@
 #include "application_manager/mock_event_dispatcher.h"
 #include "application_manager/mock_state_controller.h"
 
-#if defined(_MSC_VER)
-#define snprintf _snprintf_s
-#endif
-
 namespace test {
 namespace components {
 namespace resumption_test {
@@ -191,7 +187,7 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithFiles) {
   char numb[max_size];
   for (uint32_t i = 0; i < count_of_files; i++) {
     file_types[i] = i;
-    snprintf(numb, max_size, "%d", i);
+    std::snprintf(numb, max_size, "%d", i);
     file_names[i] = "test_file" + std::string(numb);
   }
 
@@ -322,7 +318,7 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithChoiceSet) {
   const size_t max_size = 12;
   char numb[max_size];
   for (uint32_t i = 0; i < count_of_choice; ++i) {
-    snprintf(numb, max_size, "%d", i);
+    std::snprintf(numb, max_size, "%d", i);
     choice[application_manager::strings::vr_commands] =
         "VrCommand" + std::string(numb);
     choice[application_manager::strings::choice_id] = i;
@@ -439,7 +435,7 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubscriptionToIVI) {
   smart_objects::SmartObject app_vi;
 
   int vtype = application_manager::VehicleDataType::GPS;
-  uint32_t i = 0;
+  uint i = 0;
   for (; vtype < application_manager::VehicleDataType::STEERINGWHEEL;
        ++i, ++vtype) {
     app_vi[i] = vtype;