summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2014-01-15 12:47:26 (GMT)
committerStephen Kelly <steveire@gmail.com>2014-01-15 15:23:51 (GMT)
commitf81e67c6167b9a91a1f5634303311f42f8b69c29 (patch)
tree5d449e548eac4612b980109c559c11c55cd88b37 /Help
parentc4e5e17f38c1b168fa3cfeb41f9fbc5f4186b111 (diff)
downloadCMake-f81e67c6167b9a91a1f5634303311f42f8b69c29.zip
CMake-f81e67c6167b9a91a1f5634303311f42f8b69c29.tar.gz
CMake-f81e67c6167b9a91a1f5634303311f42f8b69c29.tar.bz2
Help: Update Qt4 documentation.
Remove independent doc listing for Qt4ConfigurationSettings, Qt4Macros and UseQt4. These are implementation details. Recommend the use of IMPORTED targets. Remove references to the UseQt4 file, which is obsolete in light of the IMPORTED targets. Add documentation for automatic tool invocation and options. Remove reference to variables which should not be needed in modern implementations.
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-modules.7.rst3
-rw-r--r--Help/module/Qt4ConfigDependentSettings.rst1
-rw-r--r--Help/module/Qt4Macros.rst1
-rw-r--r--Help/module/UseQt4.rst1
4 files changed, 0 insertions, 6 deletions
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index 3f819d6..7a06be6 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -214,8 +214,6 @@ All Modules
/module/InstallRequiredSystemLibraries
/module/MacroAddFileDependencies
/module/ProcessorCount
- /module/Qt4ConfigDependentSettings
- /module/Qt4Macros
/module/SelectLibraryConfigurations
/module/SquishTestScript
/module/TestBigEndian
@@ -229,7 +227,6 @@ All Modules
/module/UseJava
/module/UseJavaSymlinks
/module/UsePkgConfig
- /module/UseQt4
/module/UseSWIG
/module/UsewxWidgets
/module/Use_wxWindows
diff --git a/Help/module/Qt4ConfigDependentSettings.rst b/Help/module/Qt4ConfigDependentSettings.rst
deleted file mode 100644
index 7002f53..0000000
--- a/Help/module/Qt4ConfigDependentSettings.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. cmake-module:: ../../Modules/Qt4ConfigDependentSettings.cmake
diff --git a/Help/module/Qt4Macros.rst b/Help/module/Qt4Macros.rst
deleted file mode 100644
index 6448d53..0000000
--- a/Help/module/Qt4Macros.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. cmake-module:: ../../Modules/Qt4Macros.cmake
diff --git a/Help/module/UseQt4.rst b/Help/module/UseQt4.rst
deleted file mode 100644
index c2f2ea8..0000000
--- a/Help/module/UseQt4.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. cmake-module:: ../../Modules/UseQt4.cmake