diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-01 16:02:59 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-01 16:02:59 +1000 |
| commit | dc1cab966938edc5463f26189607ece134549a22 (patch) | |
| tree | ecaab6c64758f41fa9cb5b376b395831a77e6c83 /doc/src/frameworks-technologies | |
| parent | 4915439de467d1119a46af66ea08dbe161d2f336 (diff) | |
| parent | bde40a9fa852107c237ac408f93a33b5955b9290 (diff) | |
| download | qt4-tools-dc1cab966938edc5463f26189607ece134549a22.tar.gz | |
Merge commit 'oslo1/master' into oslo1-master
Conflicts:
doc/src/getting-started/installation.qdoc
src/gui/dialogs/qfiledialog_win.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/assistant/tools/assistant/helpviewer.cpp
Diffstat (limited to 'doc/src/frameworks-technologies')
| -rw-r--r-- | doc/src/frameworks-technologies/activeqt-server.qdoc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/doc/src/frameworks-technologies/activeqt-server.qdoc b/doc/src/frameworks-technologies/activeqt-server.qdoc index f28097fe7f..4afcee1114 100644 --- a/doc/src/frameworks-technologies/activeqt-server.qdoc +++ b/doc/src/frameworks-technologies/activeqt-server.qdoc @@ -99,10 +99,6 @@ \o Register the server \endlist - Note that the QAxServer build system is not supported on Windows 98/ME - (attaching of resources to a binary is not possible there), but a server - built on Windows NT/2000/XP will work on previous Windows versions as well. - To skip the post-processing step, also set the \c qaxserver_no_postlink configuration. @@ -413,8 +409,7 @@ \footnote OLE needs to marshal user defined types by reference (ByRef), and cannot marshal them by value (ByVal). This is why const-references and object - parameters are not supported for QRect, QSize and QPoint. Also note that - servers with this datatype require Windows 98 or DCOM 1.2 to be installed. + parameters are not supported for QRect, QSize and QPoint. \endfootnote \o [in, out] struct QRect (user defined) \row |