diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-10-16 13:23:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-10-16 15:27:22 +0200 |
| commit | fcb12a275f856b7f871aff8aae9f70a8e28635bc (patch) | |
| tree | 22a3a25b78c8d100b6e3811de3ab9007917e45ea /doc | |
| parent | e90a48e639af0c4a01f78a78ca3b33aef4f0a114 (diff) | |
| parent | e2e96cab52948b4404cac343bb3ad7c36ca9fafd (diff) | |
| download | qt-creator-fcb12a275f856b7f871aff8aae9f70a8e28635bc.tar.gz | |
Merge remote-tracking branch 'origin/4.10' into 4.11
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
src/plugins/projectexplorer/deploymentdata.cpp
src/plugins/projectexplorer/msvctoolchain.cpp
Change-Id: I64c304fc71435629a6a0060a9df71e8952699508
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/overview/creator-only/creator-tech-support.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/overview/creator-only/creator-tech-support.qdoc b/doc/src/overview/creator-only/creator-tech-support.qdoc index ab8e45cf3b..e7dedaa829 100644 --- a/doc/src/overview/creator-only/creator-tech-support.qdoc +++ b/doc/src/overview/creator-only/creator-tech-support.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -64,7 +64,7 @@ \row \li Find free Qt-based applications - \li \l{http://qt-apps.org/}{Qt Apps} + \li \l{https://github.com/topics/qt}{Qt Apps on GitHub} \row \li Develop with a commercial Qt license and support - |