summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@digia.com>2015-01-05 13:11:18 +0100
committerNico Vertriest <nico.vertriest@digia.com>2015-01-16 10:29:35 +0100
commitddbac7de8d904d02d1f84d4d2d76c2885ffa32c0 (patch)
tree8bbc75d2196fbe30672dc0fafe1e5b4a781e0f0a
parent871560d45c1e4ad5c70c9d6b77cad8d3b15a4103 (diff)
Doc: added entry for link to main page Qt Creator
Task-number: QTBUG-43115 Change-Id: I10413536b981bf248950522dfe07b96394db9c29 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r--doc/global/externalsites/qch-urls.qdoc95
-rw-r--r--qmake/doc/src/qmake-manual.qdoc8
2 files changed, 4 insertions, 99 deletions
diff --git a/doc/global/externalsites/qch-urls.qdoc b/doc/global/externalsites/qch-urls.qdoc
deleted file mode 100644
index 53ab94091e..0000000000
--- a/doc/global/externalsites/qch-urls.qdoc
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \externalpage http://doc.qt.digia.com/qtcreator/creator-qml-application.html
- \title external: Developing Qt Quick Applications with Creator
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qtcreator/creator-visual-editor.html
- \title external: Developing Qt Quick Applications
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qtcreator/creator-publish-ovi.html
- \title external: Publishing Applications to Ovi Store
-*/
-/*!
- \externalpage http://doc.qt.io/qtcreator
- \title external: Qt Creator Manual
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qtmobility/index.html
- \title external: Qt Mobility Manual
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qtmobility/qml-plugins.html
- \title external: Qt Mobility QML Plugins
-*/
-/*!
- \externalpage http://doc.qt.io/qtcreator/creator-project-managing.html
- \title external: Creating Qt Projects in Creator
-*/
-/*!
- \externalpage http://doc.qt.io/qtcreator/creator-building-running.html
- \title external: Building and Running Applications in Creator
-*/
-/*!
- \externalpage http://doc.qt.io/qtcreator/creator-running-targets.html
- \title external: Set Compiler Targets in Creator
-*/
-/*!
- \externalpage http://doc.qt.io/qtcreator/creator-build-settings.html
- \title external: Build Settings in Creator
-*/
-/*!
- \externalpage http://doc.qt.io/qtcreator/creator-run-settings.html
- \title external: Run Settings in Creator
-*/
-/*!
- \externalpage http://doc.qt.io/qtcreator/creator-using-qt-designer.html
- \title external: Designer in Creator
-*/
-/*!
- \externalpage http://doc.qt.io/qtcreator/creator-debugging.html
- \title external: Debugging Applications in Creator
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qtmobility/multimedia.html
- \title external: Mobility Multimedia
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qtmobility/location-overview.html
- \title external: Mobility Location
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qtmobility/all-examples.html
- \title external: Qt Mobility Examples
-*/
-/*!
- \externalpage http://doc.qt.io/qtcreator/creator-overview.html
- \title external: Qt Creator Overview
-*/
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc
index 414b42d48e..b78a742999 100644
--- a/qmake/doc/src/qmake-manual.qdoc
+++ b/qmake/doc/src/qmake-manual.qdoc
@@ -122,10 +122,10 @@
configuration options to fine tune the build process. For more information,
see \l{Building Common Project Types}.
- You can use the \l{external: Qt Creator Manual}{Qt Creator} new project
- wizard to create the project file. You choose the project template, and Qt
- Creator creates a project file with default values that enable you to build
- and run the project. You can modify the project file to suit your purposes.
+ You can use the \l{Qt Creator: Creating Projects}{Qt Creator new project wizard} to create the project file.
+ You choose the project template, and Qt Creator creates a project file with
+ default values that enable you to build and run the project. You can modify
+ the project file to suit your purposes.
You can also use qmake to generate project files. For a full description of
qmake command line options, see \l{Running qmake}.