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/src/examples/dotnet.qdoc | |
| 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/src/examples/dotnet.qdoc')
| -rw-r--r-- | src/activeqt/doc/src/examples/dotnet.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
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". |