forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/4.10'
Change-Id: Iaf27911e4e9fb762c1a24c84c458462bafe95728
This commit is contained in:
@@ -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.
|
||||
@@ -33,7 +33,7 @@
|
||||
\contentspage index.html
|
||||
\previouspage creator-scxml.html
|
||||
\page creator-building-running.html
|
||||
\nextpage creator-building-targets.html
|
||||
\nextpage creator-live-preview.html
|
||||
|
||||
\title Building and Running
|
||||
|
||||
@@ -46,6 +46,14 @@
|
||||
running your project.
|
||||
|
||||
\list
|
||||
|
||||
\li \l {Previewing}
|
||||
|
||||
You can use the QML live preview to preview a QML file or an
|
||||
entire Qt Quick application on the desktop, as well as on
|
||||
Android and embedded Linux devices. The changes you make to
|
||||
the UI are instantly visible to you in the preview.
|
||||
|
||||
\li \l{Building for Multiple Platforms}
|
||||
|
||||
\e {Build configurations} contain everything you need to compile
|
||||
|
||||
@@ -256,6 +256,8 @@
|
||||
For more information about creating Qt Quick projects, see
|
||||
\l {Creating Qt Quick Projects}.
|
||||
|
||||
\include creator-python-project.qdocinc python project wizards
|
||||
|
||||
\section1 Adding Files to Projects
|
||||
|
||||
You can use wizards also to add individual files to your projects.
|
||||
@@ -408,8 +410,6 @@
|
||||
The above functions are also available in the context menu in the
|
||||
\uicontrol Projects view.
|
||||
|
||||
\include creator-python-project.qdocinc python project wizards
|
||||
|
||||
\section2 Creating OpenGL Fragment and Vertex Shaders
|
||||
|
||||
Qt provides support for integration with OpenGL implementations on all
|
||||
|
||||
@@ -269,9 +269,12 @@
|
||||
|
||||
To add a variable value to the environment, enter the variable name and
|
||||
value, separated by the equals sign. For example, the following line
|
||||
prepends \c /opt/bin to the existing PATH:
|
||||
prepends the \c /opt/bin folder to the existing PATH:
|
||||
|
||||
\c {PATH=/opt/bin:${PATH}}
|
||||
\list
|
||||
\li On Windows: \c {PATH=C:\opt\bin;${PATH}}
|
||||
\li On Linux: \c {PATH=/opt/bin:${PATH}}
|
||||
\endlist
|
||||
|
||||
To add or remove several variables, place them on separate lines. The order
|
||||
is important. If you remove a value on a line, you cannot refer to it on the
|
||||
|
||||
Reference in New Issue
Block a user