feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.3' into 3.4

Browse Source 
Conflicts:
	doc/api/coding-style.qdoc

Change-Id: Id40eb253a2e3e2357276ee76085127da10597bdb
This commit is contained in:
Eike Ziller
2015-02-25 10:15:28 +01:00
parent c6a4c80728 1104a6602b
commit 767f0ef58b
15 changed files with 79 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/projects/creator-projects-qbs.qdoc
View File

@@ -27,7 +27,7 @@
To use Qbs to build a project, you must create a .qbs file for the project.
You can use \QC to create a C or C++ project that is built with Qbs.
For more information about Qbs, see
the \l{http://qt-project.org/doc/qbs/index.html}{Qbs Manual}.
the \l{http://doc.qt.io/qbs/index.html}{Qbs Manual}.
\section1 Building Qbs
@@ -89,7 +89,7 @@
\li In the \uicontrol Properties field, specify the properties to pass
to the project. Use colons (:) to separate keys from values.
For more information, see
\l{http://qt-project.org/doc/qbs/language-introduction.html}
\l{http://doc.qt.io/qbs/language-introduction.html}
{Modules} in the Qbs Manual.
\li In the \uicontrol Flags field:

2
doc/src/projects/creator-projects-settings-build.qdoc
View File

@@ -114,7 +114,7 @@
the build step and add a custom build step that specifies another shell
command.
\QC is integrated to \l{http://doc.qt.digia.com/QtQuickCompiler/}
\QC is integrated to \l{http://doc.qt.io/QtQuickCompiler/}
{Qt Quick Compiler} (commercial only) that enables you to compile QML source
code into the final binary. This
improves the startup time of the application and eliminates the need to