From 52a89101f5c0e3bea3654133058eceaf22e5a025 Mon Sep 17 00:00:00 2001
From: Javier Carnero <javier@carnero.net>
Date: Sun, 3 Jun 2018 12:05:29 +0200
Subject: [PATCH 1/2] Qt5>=5.11 build problem solved

- Build autogenerated files to gitignore
---
 .gitignore     | 10 +++++++++-
 CMakeLists.txt |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 645c8ba..b506b8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,12 @@ Makefile*
 *.qmlproject.user
 *.qmlproject.user.*
 
-
+# Build
+CMakeCache.txt
+CMakeFiles/*
+CPackConfig.cmake
+CPackSourceConfig.cmake
+cmake_install.cmake
+cutecom
+cutecom.spec
+cutecom_autogen/*
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ee53e5..1113dc2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ set(CMAKE_AUTORCC ON)
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5Core REQUIRED)
 find_package(Qt5Gui REQUIRED)
-#find_package(Serialport REQUIRED)
+find_package(Qt5SerialPort REQUIRED)
 
 qt5_wrap_ui(uiHeaders controlpanel.ui  mainwindow.ui statusbar.ui sessionmanager.ui searchpanel.ui)
 set(cutecomSrcs main.cpp mainwindow.cpp controlpanel.cpp  devicecombo.cpp
@@ -45,7 +45,7 @@ endif(APPLE)
 add_executable(cutecom ${exeType} ${cutecomSrcs} ${uiHeaders} resources.qrc)
 
 
-qt5_use_modules(cutecom Core Gui Widgets SerialPort)
+target_link_libraries(cutecom Qt5::Core Qt5::Gui Qt5::Widgets Qt5::SerialPort)
 
 if (APPLE)
    set_target_properties(cutecom PROPERTIES OUTPUT_NAME CuteCom)

From 97b74211a22151afaa164f7ed4a592f3b75e0b10 Mon Sep 17 00:00:00 2001
From: Javier Carnero <javier@carnero.net>
Date: Sun, 3 Jun 2018 12:19:52 +0200
Subject: [PATCH 2/2] Credits and Changelog for Qt5>=5.11

---
 CREDITS   | 3 +++
 Changelog | 1 +
 2 files changed, 4 insertions(+)

diff --git a/CREDITS b/CREDITS
index 0bcd039..3e09d83 100644
--- a/CREDITS
+++ b/CREDITS
@@ -61,6 +61,9 @@ compress multiple non printable characters
 Dmitry Mastykin
 mix hex and ascii input
 
+Javier Carnero
+https://github.com/emepetres/CuteCom
+Support of Qt5>=5.11
 
 IDEAS - still a ToDo:
 ====================================
diff --git a/Changelog b/Changelog
index da6f491..e187c3f 100644
--- a/Changelog
+++ b/Changelog
@@ -4,6 +4,7 @@
 -line termination was not saved in settings - FIX
 -upgrading to clang-format to version 3.8.0
 -updating travis ci instructions - FIX
+-support for Qt5>=5.11
 0.40.0, January 12, 2017
 -First implementation of searching the output
 -Linked line termination of displayed data