From c023f5600a161e95a9077aba402a57aa2855cb07 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 17 Dec 2011 11:42:11 +0100 Subject: [PATCH] Remove plugin related variables from the CMake files. It doesn't currently have any effect and needs to be re-thought anyway. Change-Id: I6e620ca5b341264bbf5279a19e8f25af8fa7d396 Reviewed-by: Alexander Neundorf Reviewed-by: Stephen Kelly --- src/corelib/Qt5CoreConfigExtras.cmake.in | 4 ---- src/gui/Qt5GuiConfigExtras.cmake.in | 4 ---- 2 files changed, 8 deletions(-) delete mode 100644 src/gui/Qt5GuiConfigExtras.cmake.in diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in index de24287c4ce..e97493f65d0 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -5,7 +5,3 @@ get_filename_component(_qt5_corelib_install_prefix ${CMAKE_CURRENT_LIST_DIR}/$${ set(QT_QMAKE_EXECUTABLE \"${_qt5_corelib_install_prefix}/$$CMAKE_BIN_DIR/qmake$$CMAKE_BIN_SUFFIX\") set(QT_MOC_EXECUTABLE \"${_qt5_corelib_install_prefix}/$$CMAKE_BIN_DIR/moc$$CMAKE_BIN_SUFFIX\") set(QT_RCC_EXECUTABLE \"${_qt5_corelib_install_prefix}/$$CMAKE_BIN_DIR/rcc$$CMAKE_BIN_SUFFIX\") - -set(Qt5Core_PLUGIN_TYPES codecs) - -set(Qt5_CODECS_PLUGINS qcncodecs qjpcodecs qkrcodecs qtwcodecs ) diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in deleted file mode 100644 index 8ddfd450602..00000000000 --- a/src/gui/Qt5GuiConfigExtras.cmake.in +++ /dev/null @@ -1,4 +0,0 @@ - -set(Qt5Gui_PLUGIN_TYPES imageformats) - -set(Qt5_IMAGEFORMATS_PLUGINS qgif qjpeg qmng qico qtiff)