From a89f1c161e291ac3076eae2f991017e197d812e6 Mon Sep 17 00:00:00 2001
From: Jochen Baier <email@jochen-baier.de>
Date: Sat, 25 Nov 2017 11:39:23 +0100
Subject: [PATCH] Fix for issue 'Crash on press label letter': Added Qt5::Core
 in library to add QT_NO_DEBUG for disabling Q_ASSERT() macro

---
 fast_window_switcher_app/CMakeLists.txt                     | 2 ++
 fast_window_switcher_lib/CMakeLists.txt                     | 6 ++++++
 fast_window_switcher_lib/src/FastWindowSwitcher.hpp         | 2 ++
 .../src/SelectableElementRepository.hpp                     | 5 ++++-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/fast_window_switcher_app/CMakeLists.txt b/fast_window_switcher_app/CMakeLists.txt
index 5bddd2c..6e9a2a8 100644
--- a/fast_window_switcher_app/CMakeLists.txt
+++ b/fast_window_switcher_app/CMakeLists.txt
@@ -79,11 +79,13 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON) 
 set(CMAKE_AUTOUIC ON)
 
+find_package(Qt5Core REQUIRED)
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5XmlPatterns REQUIRED)
 
 add_executable(${TARGET_NAME} WIN32 ${SOURCE_FILES} )
 
+target_link_libraries(${TARGET_NAME} PRIVATE Qt5::Core)
 target_link_libraries(${TARGET_NAME} PRIVATE Qt5::Widgets)
 target_link_libraries(${TARGET_NAME} PRIVATE Qt5::XmlPatterns)
 
diff --git a/fast_window_switcher_lib/CMakeLists.txt b/fast_window_switcher_lib/CMakeLists.txt
index b5a7b4d..b62c3ff 100644
--- a/fast_window_switcher_lib/CMakeLists.txt
+++ b/fast_window_switcher_lib/CMakeLists.txt
@@ -91,10 +91,16 @@ include_directories("${CMAKE_PREFIX_PATH}/include/QtCore")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 
+find_package(Qt5Core REQUIRED)
 find_package(Qt5Widgets  REQUIRED)
+
 add_library( ${TARGET_NAME} STATIC ${SOURCE_FILES} )
 
 
+target_link_libraries(${TARGET_NAME} PRIVATE Qt5::Core)
+target_link_libraries(${TARGET_NAME} PRIVATE Qt5::Widgets)
+
+
 #set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /std:c++latest")
 #set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /std:c++latest ")
 
diff --git a/fast_window_switcher_lib/src/FastWindowSwitcher.hpp b/fast_window_switcher_lib/src/FastWindowSwitcher.hpp
index d68fb84..57053fb 100644
--- a/fast_window_switcher_lib/src/FastWindowSwitcher.hpp
+++ b/fast_window_switcher_lib/src/FastWindowSwitcher.hpp
@@ -47,6 +47,8 @@ class QString;
 class QTimer;
 struct IUIAutomation;
 
+#include <QKeyEvent>
+
 namespace FastWindowSwitcherLib
 {
   class FastWindowSwitcher :public QObject
diff --git a/fast_window_switcher_lib/src/SelectableElementRepository.hpp b/fast_window_switcher_lib/src/SelectableElementRepository.hpp
index 52d34af..5b1c7c4 100644
--- a/fast_window_switcher_lib/src/SelectableElementRepository.hpp
+++ b/fast_window_switcher_lib/src/SelectableElementRepository.hpp
@@ -34,8 +34,11 @@ Programm erhalten haben.Wenn nicht, siehe < http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include <QList>
+
 #include <memory>
+#include <vector>
+
+#include <QList>
 
 #include "SelectableElementPtr.hpp"