diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
| commit | c7934f2489e2eb9a539206bab35f335b1943c5bd (patch) | |
| tree | a27d0ed6c001fe9432e2a0f28fb935acf9e4c65f /src/corelib/doc/src/external-resources.qdoc | |
| parent | f40593b11199fbef886bfcb6b210a214d8c3adf3 (diff) | |
| parent | 08f9a1bd6ab9b1777ee5ba163d75e5c848c39eb4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess_unix.cpp
src/network/kernel/qnetworkinterface_winrt.cpp
tools/configure/configureapp.cpp
Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea
Diffstat (limited to 'src/corelib/doc/src/external-resources.qdoc')
| -rw-r--r-- | src/corelib/doc/src/external-resources.qdoc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/corelib/doc/src/external-resources.qdoc b/src/corelib/doc/src/external-resources.qdoc index d612ce8280..3d01b9ee2d 100644 --- a/src/corelib/doc/src/external-resources.qdoc +++ b/src/corelib/doc/src/external-resources.qdoc @@ -57,16 +57,6 @@ */ /*! - \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 -*/ - -/*! \externalpage http://marcmutz.wordpress.com/effective-qt/containers/#containers-qlist \title Pros and Cons of Using QList */ |