diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2011-02-16 18:01:17 (GMT) |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2011-02-16 18:01:17 (GMT) |
| commit | 9db05f0b7bf68392dc925d4047aa74dac88b348a (patch) | |
| tree | 3690ea636187c9af9459ff3bfd4cab3e2af97c57 /doc/src/snippets | |
| parent | 0df215e5afc780c1fddd9e410f7ef0814ac1307c (diff) | |
| parent | 5a1676af979ab75c8939e53e0223ccbea7708de4 (diff) | |
| download | Qt-9db05f0b7bf68392dc925d4047aa74dac88b348a.zip Qt-9db05f0b7bf68392dc925d4047aa74dac88b348a.tar.gz Qt-9db05f0b7bf68392dc925d4047aa74dac88b348a.tar.bz2 | |
Merge branch earth-team/master into earth-staging
Conflicts:
doc/src/development/qmake-manual.qdoc
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc index f6ac4f8..a35a3d9 100644 --- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc +++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc @@ -1029,3 +1029,15 @@ DEPLOYMENT += dep_note //! [156] DEPLOYMENT.display_name = My Qt App //! [156] + +//! [157] +packagesExist(sqlite3 QtNetwork QtDeclarative) { + DEFINES += USE_FANCY_UI +} +//! [157] + +//! [158] +#ifdef USE_FANCY_UI + // Use the fancy UI, as we have extra packages available +#endif +//! [158] |