diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:15:55 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:15:55 +0100 |
commit | 8ee393f9fc26948c22cfdfa4d5c1be95fac968bd (patch) | |
tree | d5bdef5e9340c64bbcf16115beced802b4170dd8 /src/activeqt/doc | |
parent | 35c178c310ebb85a8959d116acd913e7c050c8df (diff) | |
parent | 7e3a5fd664b02a537b7f5dcd73840c5c7a437519 (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-alpha1
Change-Id: Ifd323d19d2f8d9f58098f904fe44321327fa9bc8
Diffstat (limited to 'src/activeqt/doc')
-rw-r--r-- | src/activeqt/doc/activeqt.qdocconf | 2 | ||||
-rw-r--r-- | src/activeqt/doc/src/examples/dotnet.qdoc | 2 | ||||
-rw-r--r-- | src/activeqt/doc/src/qtaxserver.qdoc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/activeqt/doc/activeqt.qdocconf b/src/activeqt/doc/activeqt.qdocconf index 3f9afcf..10a340c 100644 --- a/src/activeqt/doc/activeqt.qdocconf +++ b/src/activeqt/doc/activeqt.qdocconf @@ -31,7 +31,7 @@ qhp.ActiveQt.subprojects.qaxserverclasses.sortPages = true tagfile = ../../../doc/activeqt/activeqt.tags -depends += qtcore qtdesigner qtdoc qtopengl qtscript qtwidgets +depends += qtcore qtdesigner qtdoc qtopengl qtscript qtwidgets qtgui headerdirs += .. diff --git a/src/activeqt/doc/src/examples/dotnet.qdoc b/src/activeqt/doc/src/examples/dotnet.qdoc index 5f4f575..425bdc3 100644 --- a/src/activeqt/doc/src/examples/dotnet.qdoc +++ b/src/activeqt/doc/src/examples/dotnet.qdoc @@ -222,7 +222,7 @@ the Qt objects we want to use in our form. Right-click on the empty space, and select "Customize". This opens a dialog that has two tabs, "COM Components" and ".NET Framework Components". We used - ActiveQt to wrap QWidgets into COM objects, so we select the "COM + ActiveQt to wrap \l {QWidget}s into COM objects, so we select the "COM Components" page, and look for the classes we want to use, e.g. "QPushButton" and "QAxWidget2". diff --git a/src/activeqt/doc/src/qtaxserver.qdoc b/src/activeqt/doc/src/qtaxserver.qdoc index 3ea3387..97ddcf3 100644 --- a/src/activeqt/doc/src/qtaxserver.qdoc +++ b/src/activeqt/doc/src/qtaxserver.qdoc @@ -267,7 +267,7 @@ the default factory through the QAXFACTORY_DEFAULT() macro. If you cannot provide a standard constructor you must implement a QAxFactory custom factory and call the constructor you have in - your implementation of QAxFactory::create. + your implementation of \l {QAxFactory::createObject}. \endfootnote \snippet doc_src_qaxserver.cpp 6 |