diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-04 20:45:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-04 20:45:01 (GMT) |
| commit | 5749421fdaff0305d217712e3174c85a76b367c4 (patch) | |
| tree | 0b637f8b1b727b1492808cc7856c78e950558dc7 /doc | |
| parent | 70137e5049b14d3b5c7c018b2f2111704878dfee (diff) | |
| parent | 2838cfa7809e6b196a1ee1eb71df5894fc57dd6f (diff) | |
| download | Qt-5749421fdaff0305d217712e3174c85a76b367c4.zip Qt-5749421fdaff0305d217712e3174c85a76b367c4.tar.gz Qt-5749421fdaff0305d217712e3174c85a76b367c4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix the remote command delimiter, this has cahnged at some point.
Assistant: Revert previous commit, issue was already fixed.
fix line endings
fix compilation with -plugin-kbd-*
Fix typo in docs
Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS
Fix compilation with QT_NO_DBUS
fix inaccurate comment
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/platforms/emb-directfb-EmbLinux.qdoc | 4 |
1 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. |