diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8080dd3b3..6b8cb1c38 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,7 +107,7 @@ CHECK_INCLUDE_FILES(process.h LMMS_HAVE_PROCESS_H)
 CHECK_INCLUDE_FILES(locale.h LMMS_HAVE_LOCALE_H)
 
 # check for Qt4
-SET(QT_MIN_VERSION "4.6.0")
+SET(QT_MIN_VERSION "4.6.0" COMPONENTS QtCore QtGui QtXml QtNetwork)
 FIND_PACKAGE(Qt4 REQUIRED)
 SET(QT_USE_QTXML 1)
 SET(QT_USE_QTNETWORK 1)
diff --git a/cmake/modules/MinGWCrossCompile.cmake b/cmake/modules/MinGWCrossCompile.cmake
index 57d7e6909..fa711625c 100644
--- a/cmake/modules/MinGWCrossCompile.cmake
+++ b/cmake/modules/MinGWCrossCompile.cmake
@@ -26,16 +26,7 @@ SET(WINDRES					${MINGW_TOOL_PREFIX}windres)
 SET(PKG_CONFIG_EXECUTABLE	${MINGW_TOOL_PREFIX}pkg-config)
 
 SET(QT_BINARY_DIR			${MINGW_PREFIX}/bin)
-SET(QT_LIBRARY_DIR			${MINGW_PREFIX}/lib)
-SET(QT_QTCORE_LIBRARY		${MINGW_PREFIX}/lib/libQtCore4.a)
-SET(QT_INCLUDE_DIR			${MINGW_PREFIX}/include/qt4)
-SET(QT_HEADERS_DIR			${MINGW_PREFIX}/include/qt4)
-SET(QT_QTCORE_INCLUDE_DIR	${MINGW_PREFIX}/include/qt4/QtCore)
-SET(QT_MKSPECS_DIR			${MINGW_PREFIX}/share/qt4/mkspecs)
-SET(QT_MOC_EXECUTABLE		${QT_BINARY_DIR}/moc.exe)
-SET(QT_RCC_EXECUTABLE		${QT_BINARY_DIR}/rcc.exe)
-SET(QT_QMAKE_EXECUTABLE		/usr/bin/qmake)
-SET(QT_UIC_EXECUTABLE		${QT_BINARY_DIR}/uic.exe)
+SET(QT_QMAKE_EXECUTABLE		${QT_BINARY_DIR}/qmake)
 
 # search for programs in the build host directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)