summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-01-20 15:59:19 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-01-20 15:59:19 (GMT)
commit25d414625a4ff4fe1bf5314370e8fa87cb08cdba (patch)
treec8bfff31326fb74022a5a1484956ba90660ed31d /Help
parent1b3958130e1b443368d33096764747542da28202 (diff)
parentf81e67c6167b9a91a1f5634303311f42f8b69c29 (diff)
downloadCMake-25d414625a4ff4fe1bf5314370e8fa87cb08cdba.zip
CMake-25d414625a4ff4fe1bf5314370e8fa87cb08cdba.tar.gz
CMake-25d414625a4ff4fe1bf5314370e8fa87cb08cdba.tar.bz2
Merge topic 'update-qt4-docs'
f81e67c6 Help: Update Qt4 documentation.
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