--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1357,199 +1357,6 @@
   QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL")
   SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL})
   
-  ## system png
-  IF(QT_QCONFIG MATCHES "system-png")
-    FIND_LIBRARY(QT_PNG_LIBRARY NAMES png)
-    MARK_AS_ADVANCED(QT_PNG_LIBRARY)
-    IF(QT_PNG_LIBRARY)
-      SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY})
-    ENDIF(QT_PNG_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "system-png")
-  
-  # for X11, get X11 library directory
-  IF(Q_WS_X11)
-    QT_QUERY_QMAKE(QMAKE_LIBDIR_X11 "QMAKE_LIBDIR_X11")
-  ENDIF(Q_WS_X11)
-
-  ## X11 SM
-  IF(QT_QCONFIG MATCHES "x11sm")
-    # ask qmake where the x11 libs are
-    FIND_LIBRARY(QT_X11_SM_LIBRARY NAMES SM PATHS ${QMAKE_LIBDIR_X11})
-    FIND_LIBRARY(QT_X11_ICE_LIBRARY NAMES ICE PATHS ${QMAKE_LIBDIR_X11})
-    MARK_AS_ADVANCED(QT_X11_SM_LIBRARY)
-    MARK_AS_ADVANCED(QT_X11_ICE_LIBRARY)
-    IF(QT_X11_SM_LIBRARY AND QT_X11_ICE_LIBRARY)
-      SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_X11_SM_LIBRARY} ${QT_X11_ICE_LIBRARY})
-    ENDIF(QT_X11_SM_LIBRARY AND QT_X11_ICE_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "x11sm")
-  
-  ## Xi
-  IF(QT_QCONFIG MATCHES "tablet")
-    FIND_LIBRARY(QT_XI_LIBRARY NAMES Xi PATHS ${QMAKE_LIBDIR_X11})
-    MARK_AS_ADVANCED(QT_XI_LIBRARY)
-    IF(QT_XI_LIBRARY)
-      SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XI_LIBRARY})
-    ENDIF(QT_XI_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "tablet")
-
-  ## Xrender
-  IF(QT_QCONFIG MATCHES "xrender")
-    FIND_LIBRARY(QT_XRENDER_LIBRARY NAMES Xrender PATHS ${QMAKE_LIBDIR_X11})
-    MARK_AS_ADVANCED(QT_XRENDER_LIBRARY)
-    IF(QT_XRENDER_LIBRARY)
-      SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRENDER_LIBRARY})
-    ENDIF(QT_XRENDER_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "xrender")
-  
-  ## Xrandr
-  IF(QT_QCONFIG MATCHES "xrandr")
-    FIND_LIBRARY(QT_XRANDR_LIBRARY NAMES Xrandr PATHS ${QMAKE_LIBDIR_X11})
-    MARK_AS_ADVANCED(QT_XRANDR_LIBRARY)
-    IF(QT_XRANDR_LIBRARY)
-      SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRANDR_LIBRARY})
-    ENDIF(QT_XRANDR_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "xrandr")
-  
-  ## Xcursor
-  IF(QT_QCONFIG MATCHES "xcursor")
-    FIND_LIBRARY(QT_XCURSOR_LIBRARY NAMES Xcursor PATHS ${QMAKE_LIBDIR_X11})
-    MARK_AS_ADVANCED(QT_XCURSOR_LIBRARY)
-    IF(QT_XCURSOR_LIBRARY)
-      SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XCURSOR_LIBRARY})
-    ENDIF(QT_XCURSOR_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "xcursor")
-  
-  ## Xinerama
-  IF(QT_QCONFIG MATCHES "xinerama")
-    FIND_LIBRARY(QT_XINERAMA_LIBRARY NAMES Xinerama PATHS ${QMAKE_LIBDIR_X11})
-    MARK_AS_ADVANCED(QT_XINERAMA_LIBRARY)
-    IF(QT_XINERAMA_LIBRARY)
-      SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XINERAMA_LIBRARY})
-    ENDIF(QT_XINERAMA_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "xinerama")
-  
-  ## Xfixes
-  IF(QT_QCONFIG MATCHES "xfixes")
-    FIND_LIBRARY(QT_XFIXES_LIBRARY NAMES Xfixes PATHS ${QMAKE_LIBDIR_X11})
-    MARK_AS_ADVANCED(QT_XFIXES_LIBRARY)
-    IF(QT_XFIXES_LIBRARY)
-      SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XFIXES_LIBRARY})
-    ENDIF(QT_XFIXES_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "xfixes")
-  
-  ## system-freetype
-  IF(QT_QCONFIG MATCHES "system-freetype")
-    FIND_LIBRARY(QT_FREETYPE_LIBRARY NAMES freetype)
-    MARK_AS_ADVANCED(QT_FREETYPE_LIBRARY)
-    IF(QT_FREETYPE_LIBRARY)
-      SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FREETYPE_LIBRARY})
-    ENDIF(QT_FREETYPE_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "system-freetype")
-  
-  ## fontconfig
-  IF(QT_QCONFIG MATCHES "fontconfig")
-    FIND_LIBRARY(QT_FONTCONFIG_LIBRARY NAMES fontconfig)
-    MARK_AS_ADVANCED(QT_FONTCONFIG_LIBRARY)
-    IF(QT_FONTCONFIG_LIBRARY)
-      SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FONTCONFIG_LIBRARY})
-    ENDIF(QT_FONTCONFIG_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "fontconfig")
-  
-  ## system-zlib
-  IF(QT_QCONFIG MATCHES "system-zlib")
-    FIND_LIBRARY(QT_ZLIB_LIBRARY NAMES z)
-    MARK_AS_ADVANCED(QT_ZLIB_LIBRARY)
-    IF(QT_ZLIB_LIBRARY)
-      SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY})
-    ENDIF(QT_ZLIB_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "system-zlib")
-
-  ## openssl
-  IF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
-    FIND_PACKAGE(OpenSSL)
-    IF(OPENSSL_LIBRARIES)
-      SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
-    ENDIF(OPENSSL_LIBRARIES)
-  ENDIF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
-  
-  ## dbus
-  IF(QT_QCONFIG MATCHES "dbus")
-
-    # if the dbus library isn't found, we'll assume its not required to build
-    # shared Qt on Linux doesn't require it
-    IF(NOT QT_DBUS_LIBRARY)
-      EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L dbus-1
-        OUTPUT_VARIABLE _dbus_query_output
-        RESULT_VARIABLE _dbus_result
-        ERROR_VARIABLE _dbus_query_output )
-      
-      IF(_dbus_result MATCHES 0)
-        STRING(REPLACE "-L" "" _dbus_query_output "${_dbus_query_output}")
-        SEPARATE_ARGUMENTS(_dbus_query_output)
-      ELSE(_dbus_result MATCHES 0)
-        SET(_dbus_query_output)
-      ENDIF(_dbus_result MATCHES 0)
-
-      FIND_LIBRARY(QT_DBUS_LIBRARY NAMES dbus-1 PATHS ${_dbus_query_output} )
-
-      IF(QT_DBUS_LIBRARY)
-        SET(QT_QTDBUS_LIB_DEPENDENCIES ${QT_QTDBUS_LIB_DEPENDENCIES} ${QT_DBUS_LIBRARY})
-      ENDIF(QT_DBUS_LIBRARY)
-
-      MARK_AS_ADVANCED(QT_DBUS_LIBRARY)
-    ENDIF(NOT QT_DBUS_LIBRARY)
-
-  ENDIF(QT_QCONFIG MATCHES "dbus")
-  
-  ## glib
-  IF(QT_QCONFIG MATCHES "glib")
-    
-    # if the glib libraries aren't found, we'll assume its not required to build
-    # shared Qt on Linux doesn't require it
-
-    # Qt 4.2.0+ uses glib-2.0
-    IF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
-      EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L glib-2.0 gthread-2.0
-        OUTPUT_VARIABLE _glib_query_output
-        RESULT_VARIABLE _glib_result
-        ERROR_VARIABLE _glib_query_output )
-
-      IF(_glib_result MATCHES 0)
-        STRING(REPLACE "-L" "" _glib_query_output "${_glib_query_output}")
-        SEPARATE_ARGUMENTS(_glib_query_output)
-      ELSE(_glib_result MATCHES 0)
-        SET(_glib_query_output)
-      ENDIF(_glib_result MATCHES 0)
-
-      FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0 PATHS ${_glib_query_output} )
-      FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0 PATHS ${_glib_query_output} )
-    
-      MARK_AS_ADVANCED(QT_GLIB_LIBRARY)
-      MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY)
-    ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
-
-    IF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
-      SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}
-          ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
-    ENDIF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
-
-  ENDIF(QT_QCONFIG MATCHES "glib")
-  
-  ## clock-monotonic, just see if we need to link with rt
-  IF(QT_QCONFIG MATCHES "clock-monotonic")
-    SET(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES})
-    SET(CMAKE_REQUIRED_LIBRARIES rt)
-    CHECK_SYMBOL_EXISTS(_POSIX_TIMERS "unistd.h;time.h" QT_POSIX_TIMERS)
-    SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE})
-    IF(QT_POSIX_TIMERS)
-      FIND_LIBRARY(QT_RT_LIBRARY NAMES rt)
-      MARK_AS_ADVANCED(QT_RT_LIBRARY)
-      IF(QT_RT_LIBRARY)
-        SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_RT_LIBRARY})
-      ENDIF(QT_RT_LIBRARY)
-    ENDIF(QT_POSIX_TIMERS)
-  ENDIF(QT_QCONFIG MATCHES "clock-monotonic")
-    
   IF(Q_WS_X11)
     # X11 libraries Qt absolutely depends on
     QT_QUERY_QMAKE(QT_LIBS_X11 "QMAKE_LIBS_X11")
@@ -1558,9 +1365,9 @@
       STRING(REGEX REPLACE "-l" "" QT_X11_LIB "${QT_X11_LIB}")
       SET(QT_TMP_STR "QT_X11_${QT_X11_LIB}_LIBRARY")
       FIND_LIBRARY(${QT_TMP_STR} NAMES "${QT_X11_LIB}" PATHS ${QMAKE_LIBDIR_X11})
-      MARK_AS_ADVANCED(${QT_TMP_STR})
       IF(${QT_TMP_STR})
         SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${${QT_TMP_STR}})
+        MARK_AS_ADVANCED(${QT_TMP_STR})
       ENDIF(${QT_TMP_STR})
     ENDFOREACH(QT_X11_LIB)