summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/doc_src_emb-install.qdoc
diff options
context:
space:
mode:
authorBill King <bking@trolltech.com>2010-02-09 06:11:09 (GMT)
committerBill King <bking@trolltech.com>2010-02-09 06:11:09 (GMT)
commit3318d412cb78a545790761161f243cb49da4abb7 (patch)
tree62d6612926f7bbcce8a1a28cbdb1a382339aa566 /doc/src/snippets/code/doc_src_emb-install.qdoc
parent7370dceadf969288a22c564728398cc7cb119d82 (diff)
parent72f3caa5d7821b93a4e807fb61c5cda9f2c6f393 (diff)
downloadQt-3318d412cb78a545790761161f243cb49da4abb7.zip
Qt-3318d412cb78a545790761161f243cb49da4abb7.tar.gz
Qt-3318d412cb78a545790761161f243cb49da4abb7.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6
Diffstat (limited to 'doc/src/snippets/code/doc_src_emb-install.qdoc')
-rw-r--r--doc/src/snippets/code/doc_src_emb-install.qdoc14
1 files changed, 9 insertions, 5 deletions
diff --git a/doc/src/snippets/code/doc_src_emb-install.qdoc b/doc/src/snippets/code/doc_src_emb-install.qdoc
index 1a74523..f24f087 100644
--- a/doc/src/snippets/code/doc_src_emb-install.qdoc
+++ b/doc/src/snippets/code/doc_src_emb-install.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
@@ -41,18 +41,22 @@
//! [0]
cd <anywhere>
-gunzip qt-embedded-linux-commercial-src-%VERSION%.tar.gz
-tar xf qt-embedded-linux-commercial-src-%VERSION%.tar
+gunzip qt-everywhere-opensource-src-%VERSION%.tar.gz
+tar xf qt-everywhere-opensource-src-%VERSION%.tar
//! [0]
//! [1]
-~/qt-embedded-linux-commercial-src-%VERSION%
+~/qt-everywhere-opensource-src-%VERSION%
//! [1]
+//! [embedded help]
+./configure -embedded -help
+//! [embedded help]
+
//! [2]
-cd ~/qt-embedded-linux-commercial-src-%VERSION%
+cd ~/qt-everywhere-opensource-src-%VERSION%
./configure -embedded [architecture]
//! [2]