Correctly specify Qt components

Actually, QtCore and QtGui are not added by default when specifying
other components.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b1e2c83dc5b2d83745fd79545da406fe966d318..95d78dcd4728a39d3edfec02faaae1ffdead5dfd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,8 +58,8 @@ macro_log_feature(KDE4_FOUND
   ${KDE_MIN_VERSION}
 )
 
-# Find Qt core modules (QtCore and QtGui are searched by default).
-find_package(Qt4 ${QT_MIN_VERSION} REQUIRED QtDBus)
+# Find Qt core modules.
+find_package(Qt4 ${QT_MIN_VERSION} REQUIRED QtCore QtDBus)
 
 # Search MLT package.
 find_package(LIBMLT REQUIRED)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 931ad70478e47286d48e91598cf0c89c3184581b..c5b0eb479215b4dc92cec668d04b3021fb287ab1 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 find_package(OpenGL REQUIRED)
-find_package(Qt4 ${QT_MIN_VERSION} REQUIRED QtOpenGL QtScript)
+find_package(Qt4 ${QT_MIN_VERSION} REQUIRED QtGui QtOpenGL QtScript)
 if(APPLE)
   find_package(SDL REQUIRED)
 endif(APPLE)
@@ -290,7 +290,7 @@ include_directories(
 
 # Adds Qt definitions and include directories, and sets QT_LIBRARIES according
 # to the components requested in find_package().
-include(UseQt4)
+include(${QT_USE_FILE})
 
 if(${KDE_VERSION} VERSION_LESS 4.3.80)
   set(KDE4_KNEWSTUFF_LIBS ${KDE4_KNEWSTUFF2_LIBS})