diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-31 07:37:17 (GMT) |
|---|---|---|
| committer | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-31 07:37:17 (GMT) |
| commit | 76d680844382ea24d40caaf9e0349e7b5af69ada (patch) | |
| tree | 624744baeccc3948b4583d812d77bce4a0879110 /doc/src/snippets/code | |
| parent | 5cd6323211aac99599f38a6c7363ae52b2b5bd02 (diff) | |
| parent | d448205c2e7ae31ae0814696c2c1d38ff56385bd (diff) | |
| download | Qt-76d680844382ea24d40caaf9e0349e7b5af69ada.zip Qt-76d680844382ea24d40caaf9e0349e7b5af69ada.tar.gz Qt-76d680844382ea24d40caaf9e0349e7b5af69ada.tar.bz2 | |
Merge remote branch 'qt-doc-review/master'
Conflicts:
doc/src/declarative/righttoleft.qdoc
tools/qdoc3/generator.h
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.pro | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.pro b/doc/src/snippets/code/doc_src_qmake-manual.pro index ee35b77..042ca0e 100644 --- a/doc/src/snippets/code/doc_src_qmake-manual.pro +++ b/doc/src/snippets/code/doc_src_qmake-manual.pro @@ -1023,3 +1023,7 @@ packagesExist(sqlite3 QtNetwork QtDeclarative) { // Use the fancy UI, as we have extra packages available #endif #! [158] + +#! [159] +RSS_RULES += "graphics_memory=12288;" +#! [159] |