diff --git a/CMakeLists.txt b/CMakeLists.txt
index b42df5d20be7ba5e19435179fdc8115ff378a21d..b6934ee990b0e25d92cb5feba46ac0a0b7d9dfe7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,34 +18,6 @@ if (NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Build type" FORCE)
 endif()
 
-if(DEFINED ENV{QT_VERSION})
-	set(QT_VERSION $ENV{QT_VERSION})
-endif()
-
-if(NOT QT_VERSION)
-	# try Qt 5.12.0 if none specified, last LTS.
-	set(QT_VERSION "5.12.0")
-endif()
-
-if(DEFINED ENV{QT_MKSPEC})
-	set(QT_MKSPEC $ENV{QT_MKSPEC})
-endif()
-
-if(UNIX AND NOT APPLE)
-	set(LINUX TRUE)
-endif()
-
-if(NOT QT_MKSPEC)
-	if(APPLE)
-		set(QT_MKSPEC clang_64)
-	elseif(LINUX)
-		set(QT_MKSPEC gcc_64)
-	elseif(WIN32)
-		set(QT_MKSPEC msvc2017_64)
-		#set(QT_MKSPEC winrt_x64_msvc2017)
-	endif()
-endif()
-
 # Add folder where are supportive functions
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
@@ -89,12 +61,7 @@ endif()
 #=============================================================================
 # Qt5
 #
-set(QT_LIBRARY_HINTS
-		$ENV{HOME}/Qt/${QT_VERSION}/${QT_MKSPEC}
-		$ENV{QT_PATH}/${QT_VERSION}/${QT_MKSPEC}
-		C:/Qt
-)
-
+include(Qt5QGCConfiguration)
 find_package(Qt5 ${QT_VERSION}
 	COMPONENTS
 		Bluetooth
diff --git a/cmake/Qt5QGCConfiguration.cmake b/cmake/Qt5QGCConfiguration.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..6f8cd59ae19f248568e8a44f15129c60348fb375
--- /dev/null
+++ b/cmake/Qt5QGCConfiguration.cmake
@@ -0,0 +1,33 @@
+if(DEFINED ENV{QT_VERSION})
+	set(QT_VERSION $ENV{QT_VERSION})
+endif()
+
+if(NOT QT_VERSION)
+	# try Qt 5.12.0 if none specified, last LTS.
+	set(QT_VERSION "5.12.0")
+endif()
+
+if(DEFINED ENV{QT_MKSPEC})
+	set(QT_MKSPEC $ENV{QT_MKSPEC})
+endif()
+
+if(UNIX AND NOT APPLE)
+	set(LINUX TRUE)
+endif()
+
+if(NOT QT_MKSPEC)
+	if(APPLE)
+		set(QT_MKSPEC clang_64)
+	elseif(LINUX)
+		set(QT_MKSPEC gcc_64)
+	elseif(WIN32)
+		set(QT_MKSPEC msvc2017_64)
+		#set(QT_MKSPEC winrt_x64_msvc2017)
+	endif()
+endif()
+
+set(QT_LIBRARY_HINTS
+		$ENV{HOME}/Qt/${QT_VERSION}/${QT_MKSPEC}
+		$ENV{QT_PATH}/${QT_VERSION}/${QT_MKSPEC}
+		C:/Qt
+)