summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid <mike@mikemcquaid.com>2011-10-28 16:31:30 (GMT)
committerDavid Cole <david.cole@kitware.com>2011-11-01 17:54:34 (GMT)
commit9cfc920973b6e479e3ba30e6b89e26ddea4d892f (patch)
treecd62f93d340181e9c314ce1d295b7915dd370da7
parent13d19468d03bfea1b886c5473e8fcafa09cf2e3a (diff)
downloadCMake-9cfc920973b6e479e3ba30e6b89e26ddea4d892f.zip
CMake-9cfc920973b6e479e3ba30e6b89e26ddea4d892f.tar.gz
CMake-9cfc920973b6e479e3ba30e6b89e26ddea4d892f.tar.bz2
Match fixup_qt4_executable with documentation.
-rw-r--r--Modules/DeployQt4.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake
index bdf8360..3e20d34 100644
--- a/Modules/DeployQt4.cmake
+++ b/Modules/DeployQt4.cmake
@@ -56,7 +56,7 @@
# (or <plugins_dir>) relative to <executable> and store the result in
# <installed_plugin_path_var>. See documentation of INSTALL_QT4_PLUGIN_PATH.
#
-# INSTALL_QT4_EXECUTABLE(<executable> <qtplugins> [<libs> <dirs> <plugins_dir> <request_qt_conf>])
+# INSTALL_QT4_EXECUTABLE(<executable> [<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf>])
# Installs Qt plugins, writes a Qt configuration file (if needed) and fixes up
# a Qt4 executable using BundleUtilities so it is standalone and can be
# drag-and-drop copied to another machine as long as all of the system
@@ -106,7 +106,8 @@ function(resolve_qt4_paths paths_var)
set(${paths_var} ${paths_resolved} PARENT_SCOPE)
endfunction()
-function(fixup_qt4_executable executable qtplugins)
+function(fixup_qt4_executable executable)
+ set(qtplugins ${ARGV1})
set(libs ${ARGV2})
set(dirs ${ARGV3})
set(plugins_dir ${ARGV4})