diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-05 15:20:28 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-05 15:20:28 (GMT) |
| commit | 909c084d0c275ec5e747f395b7e0cd39a1d052bc (patch) | |
| tree | d9e9f9e99dba572471c14ec00b16f4eba07c9dac /doc/src/platforms | |
| parent | cb086eb5340c4c41efaf45373aa05c37e8aa974a (diff) | |
| parent | 05bb249c2ad3ee15eb205a806f8546c105683096 (diff) | |
| download | Qt-909c084d0c275ec5e747f395b7e0cd39a1d052bc.zip Qt-909c084d0c275ec5e747f395b7e0cd39a1d052bc.tar.gz Qt-909c084d0c275ec5e747f395b7e0cd39a1d052bc.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'doc/src/platforms')
| -rw-r--r-- | doc/src/platforms/emb-directfb-EmbLinux.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/platforms/platform-notes.qdocinc | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/platforms/emb-directfb-EmbLinux.qdoc b/doc/src/platforms/emb-directfb-EmbLinux.qdoc index b4f44bf..955258e 100644 --- a/doc/src/platforms/emb-directfb-EmbLinux.qdoc +++ b/doc/src/platforms/emb-directfb-EmbLinux.qdoc @@ -147,8 +147,8 @@ your qmake.conf. #DEFINES += \"QT_DIRECTFB_DISABLE_RASTERFALLBACKS=$$DIRECTFB_DRAWINGOPERATIONS\" \endcode -As demonstrated above, you need to Qt which drawing operations you want to -warn/disable. Since there are varying implementations of DirectFB from +As demonstrated above, you need to tell Qt which drawing operations you want +to warn/disable. Since there are varying implementations of DirectFB from manufacturer to manufacture, different operations will be optimized. This require you to define the operations you want to warn about or disable. These are listed above in the DIRECTFB_DRAWINGOPERATIONS variable. diff --git a/doc/src/platforms/platform-notes.qdocinc b/doc/src/platforms/platform-notes.qdocinc new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/doc/src/platforms/platform-notes.qdocinc |