aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2009-04-17 16:09:54 +0200
committercon <qtc-committer@nokia.com>2009-04-17 16:10:34 +0200
commit124fa21854b4d6633230fd2f65bcfc9774261223 (patch)
treecbde0f2102db94d1458e3c4bd4c13febd4d0e3b8
parenta86f38a9562df9855d1fcb0dca663f2e538a85aa (diff)
Screenshots for cmake support documentation.
Reviewed-by: dt <qtc-committer@nokia.com>
-rw-r--r--doc/images/qtcreator-cmake-build-settings.pngbin0 -> 63687 bytes
-rw-r--r--doc/images/qtcreator-cmake-import-wizard1.pngbin0 -> 125518 bytes
-rw-r--r--doc/images/qtcreator-cmake-import-wizard2.pngbin0 -> 106660 bytes
-rw-r--r--doc/qtcreator.qdoc6
4 files changed, 4 insertions, 2 deletions
diff --git a/doc/images/qtcreator-cmake-build-settings.png b/doc/images/qtcreator-cmake-build-settings.png
new file mode 100644
index 0000000000..d1db584008
--- /dev/null
+++ b/doc/images/qtcreator-cmake-build-settings.png
Binary files differ
diff --git a/doc/images/qtcreator-cmake-import-wizard1.png b/doc/images/qtcreator-cmake-import-wizard1.png
new file mode 100644
index 0000000000..1d473d3e54
--- /dev/null
+++ b/doc/images/qtcreator-cmake-import-wizard1.png
Binary files differ
diff --git a/doc/images/qtcreator-cmake-import-wizard2.png b/doc/images/qtcreator-cmake-import-wizard2.png
new file mode 100644
index 0000000000..c9b8d3703c
--- /dev/null
+++ b/doc/images/qtcreator-cmake-import-wizard2.png
Binary files differ
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index cf32a122d5..800db76b2b 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -1273,10 +1273,12 @@
not have an in-place build, Qt Creator lets you specify the directory in
which the project is built (shadow build).
+ \image qtcreator-cmake-import-wizard1.png
+
The screenshot below shows how you can specify command line arguments to
\c CMake for your project.
- ###TODO one, two pictures ? \image qtcreator-import-wizard.png
+ \image qtcreator-cmake-import-wizard2.png
Normally, there is no need to pass any command line arguments for projects
that are already built, as \c CMake caches that information.
@@ -1291,7 +1293,7 @@
By default Qt Creator builds the "all" target. You can change which
targets get build in the Project/Build Settings.
- ### \image qtcreator-build-settings.png
+ \image qtcreator-cmake-build-settings.png
Currently only one build configuration is supported and the
build directory can't be changed after the initial import. This