Merge topic 'add-extra-qbs-generator'

f85db2f3 Qbs: Add new 'extra' generator for qbs project files

3 files changed, 32 insertions, 0 deletions

diff --git a/Help/generator/Qbs.rst b/Help/generator/Qbs.rst
new file mode 100644
index 0000000..e569b77
--- /dev/null
+++ b/Help/generator/Qbs.rst
@@ -0,0 +1,25 @@
+Qbs
+---
+
+Generates Qbs project files.
+
+Project files for Qbs will be created in the top directory and
+in every subdirectory which features a CMakeLists.txt file containing
+a PROJECT() call.  Additionally a hierarchy of makefiles is generated
+into the build tree.  The appropriate make program can build the
+project through the default make target.  A "make install" target is
+also provided.
+
+This "extra" generator may be specified as:
+
+``Qbs - MinGW Makefiles``
+ Generate with :generator:`MinGW Makefiles`.
+
+``Qbs - NMake Makefiles``
+ Generate with :generator:`NMake Makefiles`.
+
+``Qbs - Ninja``
+ Generate with :generator:`Ninja`.
+
+``Qbs - Unix Makefiles``
+ Generate with :generator:`Unix Makefiles`.
diff --git a/Help/manual/cmake-generators.7.rst b/Help/manual/cmake-generators.7.rst
index bda7eef..804229b 100644
--- a/Help/manual/cmake-generators.7.rst
+++ b/Help/manual/cmake-generators.7.rst
@@ -85,3 +85,4 @@ The following extra generators are known to CMake.
    /generator/KDevelop3
    /generator/Kate
    /generator/Sublime Text 2
+   /generator/Qbs
diff --git a/Help/release/dev/add-extra-qbs-generator.rst b/Help/release/dev/add-extra-qbs-generator.rst
new file mode 100644
index 0000000..edb441f
--- /dev/null
+++ b/Help/release/dev/add-extra-qbs-generator.rst
@@ -0,0 +1,6 @@
+add-extra-qbs-geneator
+----------------------
+
+* It is now possible to generate :generator:`Qbs` project files
+  for use with QtCreator IDE, matching make tool must be used
+  to build the project through the generated makefiles.