aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-30 23:32:57 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-30 23:32:57 +1000
commit817c42a97ab35bdefe66e68675933b2a16c2027e (patch)
tree460eacd7390b5ce8b231ca5d3e530f16dcf0307d
parent250b6004e6e2fb9e495abce3cdb0012b4c1e66e5 (diff)
parenta4694332c8942a0ef78945d712aa1b7524c889bf (diff)
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging: Tells readers about qt5_tool
-rw-r--r--README16
1 files changed, 13 insertions, 3 deletions
diff --git a/README b/README
index 8e31031a..c63d7bfa 100644
--- a/README
+++ b/README
@@ -1,16 +1,26 @@
To clone and compile the submodules, do execute the following:
./init-repository
- ./configure
+ ./qtrepotools/bin/qt5_tool -p
+ ./configure
make
-If you are a Nokia developer, you should add the -nokia-developer argument.
+If you are a Nokia developer, you should add the -nokia-developer argument:
./init-repository -nokia-developer
- ./configure -nokia-developer
+ ./qtrepotools/bin/qt5_tool -p
+ ./configure -nokia-developer
make
+Checkout qt5_tool --help for more interesting features, like -s <module> to
+switch to the staging repo of a module.
In order to install the grafts, run
git submodule foreach '../qtrepotools/bin/git-qt-grafts <path_to_history>'
+Note: Currently the repo is in a state, where it does not always build,
+especially tests, examples, and demos. Unfortunately make -k also does not
+help. A workaround is to configure with
+
+ -nomake tests -nomake examples -nomake demos.
+