diff options
Diffstat (limited to 'doc/src/projects/creator-projects-creating.qdoc')
| -rw-r--r-- | doc/src/projects/creator-projects-creating.qdoc | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index 99901bce06..895fcf9f16 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -55,8 +55,7 @@ process for development projects across different platforms. qmake automates the generation of build configurations so that only a few lines of information are needed to create each configuration. For more - information about qmake, see the - \l{http://qt-project.org/doc/qt-5.0/qtdoc/qmake-manual.html}{qmake Manual}. + information about qmake, see the \l{qmake Manual}. You can modify the build and run settings for qmake projects in the \gui Projects mode. @@ -199,6 +198,12 @@ Plain C or C++ project that uses CMake but does not use the Qt library + \li Plain C or C++ Project (Qbs Build) + + Plain C or C++ project that uses Qbs but does not use the Qt + library. This project type is listed if the experimental Qbs + plugin has been enabled in \gui Help > \gui {About Plugins}. + \endlist \li Import Project @@ -321,11 +326,12 @@ Qt provides support for integration with OpenGL implementations on all platforms, which allows you to display hardware accelerated 3D graphics alongside a more conventional user interface. For more information, see - \l{http://qt-project.org/doc/qt-5.0/qtopengl/qtopengl-index.html}{Qt OpenGL}. + \l{Qt Gui#opengl-and-opengl-es-integration}{OpenGL and OpenGL ES integration}. - You can use the QGLShader class to compile OpenGL shaders written in the + You can use the QOpenGLShader class to compile OpenGL shaders written in the OpenGL Shading Language (GLSL) and in the OpenGL/ES Shading Language - (GLSL/ES). QGLShader and QGLShaderProgram shelter you from the details of + (GLSL/ES). QOpenGLShader and QOpenGLShaderProgram shelter you from the + details of compiling and linking vertex and fragment shaders. You can use \QC code editor to write fragment and vertex shaders @@ -374,8 +380,7 @@ the root project and to add another project, such as a C++ library. The wizard creates a project file (.pro) that defines a \c subdirs template - and the subproject that you add as a value of the - \l{http://qt-project.org/doc/qt-5.0/qtdoc/qmake-variable-reference.html#subdirs} + and the subproject that you add as a value of the \l{Variables#subdirs} {SUBDIRS variable}. It also adds all the necessary files for the subproject. To add more subprojects, right-click the project name in the \gui Projects |