diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-09-05 01:34:21 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-09-05 01:34:39 (GMT) |
| commit | 8aea7e0764f1e1495e78f9298d006a600a6db395 (patch) | |
| tree | 68dc0405f19b287975c81dc7fbe0513f6ad2ae00 /doc/src | |
| parent | 6c3f538a0657bd7b00f32934234395682623c17a (diff) | |
| parent | b504a21a7d62b24ac5f16cb3f1a88479da1499d5 (diff) | |
| download | Qt-8aea7e0764f1e1495e78f9298d006a600a6db395.zip Qt-8aea7e0764f1e1495e78f9298d006a600a6db395.tar.gz Qt-8aea7e0764f1e1495e78f9298d006a600a6db395.tar.bz2 | |
Merge branch '4.6' into master
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/platforms/supported-platforms.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_corelib_io_qprocess.cpp | 2 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_corelib_kernel_qobject.cpp | 22 |
3 files changed, 22 insertions, 4 deletions
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc index e65d569..5791908 100644 --- a/doc/src/platforms/supported-platforms.qdoc +++ b/doc/src/platforms/supported-platforms.qdoc @@ -89,6 +89,8 @@ \o gcc (\l{http:\\www.codesourcery.com}{Codesourcery version)} \row \o Windows CE 5.0 (ARMv4i, x86, MIPS) \o MSVC 2005 WinCE 5.0 Standard (x86, pocket, smart, mipsii) + \row \o Symbian (S60 3.1, 3.2 and 5.0) + \o RVCT, GCCE, WINSCW \endtable \section1 Tier 2 Platforms diff --git a/doc/src/snippets/code/src_corelib_io_qprocess.cpp b/doc/src/snippets/code/src_corelib_io_qprocess.cpp index e15b376..5ebb747 100644 --- a/doc/src/snippets/code/src_corelib_io_qprocess.cpp +++ b/doc/src/snippets/code/src_corelib_io_qprocess.cpp @@ -73,7 +73,7 @@ command1 | command2 QProcess process1; QProcess process2; -process1.setStandardOutputProcess(process2); +process1.setStandardOutputProcess(&process2); process1.start("command1"); process2.start("command2"); diff --git a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp index 2c18036..c200c30 100644 --- a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp +++ b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp @@ -404,9 +404,25 @@ public: //! [38] -//! [39] -Q_FLAGS(Options Alignment) -//! [39] +//! [39a] +class QLibrary : public QObject +{ + ... + Q_FLAGS(LoadHint LoadHints) + ... +//! [39a] + +//! [39b] + ... +public: + enum LoadHint { + ResolveAllSymbolsHint = 0x01, + ExportExternalSymbolsHint = 0x02, + LoadArchiveMemberHint = 0x04 + }; + Q_DECLARE_FLAGS(LoadHints, LoadHint) + ... +//! [39b] //! [40] |