diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-21 11:14:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-01-21 11:14:34 +0100 |
| commit | 112342b32650f56e289c7dcd181d5897b0b77a78 (patch) | |
| tree | 76e9a37bcaa70097d009628bb2b116ea782c72cb /src/corelib/doc/src/external-resources.qdoc | |
| parent | 3bbc1bf53bac7648637d92abecadc568acfffb2d (diff) | |
| parent | b6191b16d41459ed73cea738dfaf8e25e81ae22b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/doc/src/external-resources.qdoc')
| -rw-r--r-- | src/corelib/doc/src/external-resources.qdoc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/corelib/doc/src/external-resources.qdoc b/src/corelib/doc/src/external-resources.qdoc index a4f1b8723a..03af1d81bf 100644 --- a/src/corelib/doc/src/external-resources.qdoc +++ b/src/corelib/doc/src/external-resources.qdoc @@ -55,3 +55,14 @@ \externalpage http://www.iana.org/assignments/character-sets/character-sets.xml \title IANA character-sets encoding file */ + +/*! + \externalpage http://doc-snapshot.qt-project.org/qt5-5.4/qtdesigner-manual.html + \title Using a Designer UI File in Your Application +*/ + +/*! + \externalpage http://doc-snapshot.qt-project.org/qt5-5.4/designer-widget-mode.html#the-property-editor + \title Qt Designer's Widget Editing Mode#The Property Editor +*/ +*/ |