diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-24 06:03:27 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-24 06:03:27 (GMT) |
| commit | f8fabc79d74b3043ca524b6376d662f46b4a7f2e (patch) | |
| tree | f4c9b40988d55ca64950626e6e63f8fd644d20ed /doc/src/snippets/code/src_activeqt_container_qaxbase.cpp | |
| parent | 232fa760b0fb304116f0d17c3e7c25fdcea3d6bf (diff) | |
| parent | ede5f8cb8ae1fcc7631cc05e9c57c0cfa5790ef5 (diff) | |
| download | Qt-f8fabc79d74b3043ca524b6376d662f46b4a7f2e.zip Qt-f8fabc79d74b3043ca524b6376d662f46b4a7f2e.tar.gz Qt-f8fabc79d74b3043ca524b6376d662f46b4a7f2e.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Conflicts:
demos/embedded/fluidlauncher/pictureflow.cpp
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
tests/auto/moc/os9-newlines.h
tests/auto/qsqldatabase/tst_databases.h
tools/xmlpatterns/main.h
tools/xmlpatterns/qcoloringmessagehandler_p.h
tools/xmlpatterns/qcoloroutput.cpp
tools/xmlpatterns/qcoloroutput_p.h
Diffstat (limited to 'doc/src/snippets/code/src_activeqt_container_qaxbase.cpp')
| -rw-r--r-- | doc/src/snippets/code/src_activeqt_container_qaxbase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp b/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp index 94b0da8..219fb70 100644 --- a/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp +++ b/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp @@ -105,12 +105,12 @@ ctrl->setControl("DOMAIN/user:password@server/{8E27C92B-1264-101C-8A2F-040224009 //! [15] -activeX->dynamicCall("Navigate(const QString&)", "qtsoftware.com"); +activeX->dynamicCall("Navigate(const QString&)", "qt.nokia.com"); //! [15] //! [16] -activeX->dynamicCall("Navigate(\"qtsoftware.com\")"); +activeX->dynamicCall("Navigate(\"qt.nokia.com\")"); //! [16] |