diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-18 10:40:11 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-18 10:40:11 +0200 |
| commit | 49d5c2381a479b735913d4187de9e5111ded9e85 (patch) | |
| tree | 3e69654ec2692d5bef98cd22bbdcc65155c43c1e /doc | |
| parent | 49e7ec748ee61fa07cbce9a94a564f13219b3d69 (diff) | |
| parent | d8e6a314e521eff5500242e6eb65f29d45e769b8 (diff) | |
| download | qt-creator-49d5c2381a479b735913d4187de9e5111ded9e85.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.pri
qtcreator.qbp
src/libs/3rdparty/botan/botan.qbs
src/libs/ssh/ssh.qbs
src/plugins/qnx/blackberryqtversion.cpp
Change-Id: Ie8d16d636528aab4006310eab47a342fdf2634d9
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/overview/creator-tech-support.qdoc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/doc/src/overview/creator-tech-support.qdoc b/doc/src/overview/creator-tech-support.qdoc index 2ab040b19f..d0a270c21d 100644 --- a/doc/src/overview/creator-tech-support.qdoc +++ b/doc/src/overview/creator-tech-support.qdoc @@ -41,8 +41,11 @@ \row \o Learn more about Qt - \o \l{http://qt.nokia.com/developer/learning/online/training/specialized-elearning/} - {Specialized eLearning Modules Based on Qt Training Modules} + \o \l{http://qt.digia.com/product/learning/}{Learning} + from Digia + + \l{http://qt-project.org/wiki/developer-guides} + {Qt Developer Guides} from Qt Project \row \o Develop Qt applications for desktop and mobile devices @@ -55,15 +58,15 @@ \row \o Participate in Qt development - \o \l{http://qt.gitorious.org/}{Qt Git Hosting} + \o \l{http://qt-project.org/contribute}{Contribute to Qt} \row \o Find free Qt-based applications \o \l{http://qt-apps.org/}{Qt Apps} \row - \o Buy commercial Qt support from Digia - \o \l{http://qt.digia.com/}{Qt Commercial} + \o Develop with a commercial Qt license and support - Qt by Digia + \o \l{http://qt.digia.com/Product/Licensing/}{Qt Licensing} \endtable */ |