Commit 0d0121b0 authored by Leena Miettinen's avatar Leena Miettinen Committed by Casper van Donderen

Doc: switch links to point to qt-project.org

Change-Id: I136a28697c0b7aba03227387c5ce2e106c52708a
Reviewed-by: default avatarCasper van Donderen <casper.vandonderen@nokia.com>
parent fd7eeb75
......@@ -32,7 +32,7 @@
\title Debugging a Qt Quick Example Application
This section uses the
\l{http://doc.qt.nokia.com/4.7/demos-declarative-samegame.html}{Same Game}
\l{http://qt-project.org/doc/qt-4.8/demos-declarative-samegame.html}{Same Game}
demo application to illustrate how to debug Qt Quick applications in the
\gui Debug mode.
......
......@@ -1148,7 +1148,7 @@
\gui {Regular Expressions}.
Regular expressions used in \QC are modeled on Perl regular
expressions. For more information on using regular expressions, see
\l {http://doc.qt.nokia.com/4.7/qregexp.html#details}
\l {http://qt-project.org/doc/qt-4.8/qregexp.html#details}
{Detailed Description} in the QRegExp Class Reference.
\endlist
......
......@@ -57,7 +57,8 @@
External > Configure}.
For more information about Qt Linguist, see
\l{http://doc.qt.nokia.com/4.7/linguist-manual.html}{Qt Linguist Manual}.
\l{http://qt-project.org/doc/qt-4.8/linguist-manual.html}
{Qt Linguist Manual}.
\section1 Using QML Viewer
......
......@@ -177,7 +177,7 @@
For information on how to prepare your documentation and create a
.qch file, see
\l{http://doc.qt.nokia.com/4.7/qthelp-framework.html}
\l{http://qt-project.org/doc/qt-4.8/qthelp-framework.html}
{The Qt Help Framework}.
\o To add the .qch file to \QC, select \gui Tools > \gui Options >
......
......@@ -44,7 +44,7 @@
\gui {Remote Directory} field displays the folder where the file is
installed on the device. Text in red color indicates that the information is
missing. Edit the qmake
\l{http://doc.qt.nokia.com/4.8/qmake-variable-reference.html#installs}
\l{http://qt-project.org/doc/qt-4.8/qmake-variable-reference.html#installs}
{INSTALLS variable} in the project .pro file to add the missing files.
When you run the application, \QC copies the necessary files to the device
......
......@@ -68,7 +68,7 @@
be defined in Button.qml. The QML runtime may instantiate this
Button component to create Button objects. Alternatively, a
component may be defined inside a
\l{http://doc.qt.nokia.com/4.7-snapshot/qmlreusablecomponents.html}
\l{http://qt-project.org/doc/qt-4.8/qmlreusablecomponents.html}
{Component} element.
\row
......
......@@ -60,7 +60,8 @@
\QC provides two integrated visual editors, \QMLD and \QD.
To create intuitive, modern-looking, fluid user interfaces, you
can use \l {http://doc.qt.nokia.com/4.7/qtquick.html}{Qt Quick}.
can use \l {http://qt-project.org/doc/qt-4.8/qtquick.html}
{Qt Quick}.
If you need a traditional user interface that is clearly
structured and enforces a platform look and feel, you can use
the integrated \QD. For more information, see
......
......@@ -57,7 +57,7 @@
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.nokia.com/doc/4.7/qmake-manual.html}{qmake Manual}.
\l{http://qt-project.org/doc/qt-4.8/qmake-manual.html}{qmake Manual}.
You can modify the build and run settings for qmake projects in the
\gui Projects mode.
......@@ -325,7 +325,7 @@
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://doc.qt.nokia.com/4.7/qtopengl.html}{QtOpenGL Module}.
\l{http://qt-project.org/doc/qt-4.8/qtopengl.html}{QtOpenGL Module}.
You can use the QGLShader class to compile OpenGL shaders written in the
OpenGL Shading Language (GLSL) and in the OpenGL/ES Shading Language
......@@ -379,7 +379,7 @@
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://doc.qt.nokia.com/4.7/qmake-variable-reference.html#subdirs}
\l{http://qt-project.org/doc/qt-4.8/qmake-variable-reference.html#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
......
......@@ -89,7 +89,7 @@
\endlist
For more information about the project file settings, see
\l{http://doc.qt.nokia.com/4.7/qmake-project-files.html#declaring-other-libraries}
\l{http://qt-project.org/doc/qt-4.8/qmake-project-files.html#declaring-other-libraries}
{Declaring Other Libraries}.
\section1 Example of Adding Internal Libraries
......
......@@ -61,7 +61,7 @@
{shadow builds} are used to keep the build specific files separate
from the source. You can create separate versions of project files
to keep platform-dependent code separate. You can use qmake
\l{http://qt.nokia.com/doc/4.7/qmake-tutorial.html#adding-platform-specific-source-files}
\l{http://qt-project.org/doc/qt-4.8/qmake-tutorial.html#adding-platform-specific-source-files}
{scopes} to select the file to process depending on which platform
qmake is run on.
......
......@@ -90,9 +90,11 @@
A user interface is only a part of an application, and not really useful by itself.
You can use Qt or JavaScript to implement the application logic. For more information on
using JavaScript, see
\l {http://doc.qt.nokia.com/4.7/qdeclarativejavascript.html} {Integrating JavaScript}.
\l {http://qt-project.org/doc/qt-4.8/qdeclarativejavascript.html}
{Integrating JavaScript}.
For an example of how to use JavaScript to develop a game, see the
\l {http://doc.qt.nokia.com/4.7/qml-advtutorial.html} {QML Advanced Tutorial}.
\l {http://qt-project.org/doc/qt-4.8/qml-advtutorial.html}
{QML Advanced Tutorial}.
*/
......@@ -34,10 +34,10 @@
\note To complete this tutorial, you must have Qt 4.7 or later installed.
This tutorial uses built-in QML elements and illustrates basic concepts of
\l {http://doc.qt.nokia.com/4.7/qtquick.html}{Qt Quick}.
\l {http://qt-project.org/doc/qt-4.8/qtquick.html}{Qt Quick}.
This tutorial describes how to use the \QC to implement the
\l{http://doc.qt.nokia.com/4.7/declarative-animation-states.html}
\l{http://qt-project.org/doc/qt-4.8/declarative-animation-states.html}
{states and transitions example application}. The example application
displays a Qt logo that moves between three rectangles on the page when you
click them.
......
......@@ -92,7 +92,7 @@
\endlist
To create a graphical button that scales beautifully without using vector
graphics, use the \l{http://doc.qt.nokia.com/4.7/qml-borderimage.html}
graphics, use the \l{http://qt-project.org/doc/qt-4.8/qml-borderimage.html}
{Border Image} element. For more information, see
\l{Creating Scalable Buttons and Borders}.
......@@ -108,7 +108,7 @@
\title Creating Scalable Buttons and Borders
You can use the \l{http://doc.qt.nokia.com/4.7/qml-borderimage.html}
You can use the \l{http://qt-project.org/doc/qt-4.8/qml-borderimage.html}
{Border Image} element to display an image, such as a PNG file, as a border
and a background.
......
......@@ -42,33 +42,34 @@
\list
\o \l{http://doc.qt.nokia.com/4.7/qml-borderimage.html}{Border Image}
\o \l{http://qt-project.org/doc/qt-4.8/qml-borderimage.html}
{Border Image}
uses an image as a border or background.
\o \l{http://doc.qt.nokia.com/4.7/qml-image.html}{Image}
\o \l{http://qt-project.org/doc/qt-4.8/qml-image.html}{Image}
adds a bitmap to the scene. You can stretch and tile images.
\o \l{http://doc.qt.nokia.com/4.7/qml-item.html}{Item}
\o \l{http://qt-project.org/doc/qt-4.8/qml-item.html}{Item}
is the most basic of all visual items in QML. Even though it has no
visual appearance, it defines all the properties that are common
across visual items, such as the x and y position, width and height,
anchoring, and key handling.
\o \l{http://doc.qt.nokia.com/4.7/qml-rectangle.html}{Rectangle}
\o \l{http://qt-project.org/doc/qt-4.8/qml-rectangle.html}{Rectangle}
adds a rectangle that is painted with a solid fill color and an
optional border. You can also use the radius property to create
rounded rectangles.
\o \l{http://doc.qt.nokia.com/4.7/qml-text.html}{Text}
\o \l{http://qt-project.org/doc/qt-4.8/qml-text.html}{Text}
adds formatted read-only text.
\o \l{http://doc.qt.nokia.com/4.7/qml-textedit.html}{Text Edit}
\o \l{http://qt-project.org/doc/qt-4.8/qml-textedit.html}{Text Edit}
adds a single line of editable formatted text that can be validated.
\o \l{http://doc.qt.nokia.com/4.7/qml-textinput.html}{Text Input}
\o \l{http://qt-project.org/doc/qt-4.8/qml-textinput.html}{Text Input}
adds a single line of editable plain text that can be validated.
\o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-webview.html}{Web View}
\o \l{http://qt-project.org/doc/qt-4.8/qml-webview.html}{Web View}
adds web content to a canvas.
\endlist
......
......@@ -121,7 +121,7 @@
\endlist
The \c import statement in the beginning of the .qml file specifies the
\l{http://doc.qt.nokia.com/4.7/qdeclarativemodules.html}{Qt modules} to
\l{http://qt-project.org/doc/qt-4.8/qdeclarativemodules.html}{Qt modules} to
import. Each Qt module contains a set of default elements. Specify a version
to get the features you want.
......
......@@ -67,7 +67,7 @@
\section1 Managing Element Hierarchy
The \gui Navigator pane displays the
\l{http://doc.qt.nokia.com/4.7/qdeclarativeelements.html}{QML elements}
\l{http://qt-project.org/doc/qt-4.8/qdeclarativeelements.html}{QML elements}
in the current QML file and their relationships. Elements (1) are listed in a
tree structure, below their parent (2).
......@@ -109,7 +109,7 @@
\section2 Setting the Stacking Order
The \l{http://doc.qt.nokia.com/4.7/qml-item.html#z-prop}{z property} of an
The \l{http://qt-project.org/doc/qt-4.8/qml-item.html#z-prop}{z property} of an
element determines its position in relation to its sibling elements in the
element hierarchy. By default, elements with a higher stacking value are
drawn on top of siblings with a lower stacking value. Elements with the same
......@@ -241,7 +241,7 @@
\section2 Setting Expressions
\l{http://doc.qt.nokia.com/4.7/propertybinding.html}{Property binding} is a
\l{http://qt-project.org/doc/qt-4.8/propertybinding.html}{Property binding} is a
declarative way of specifying the value of a property.
Binding allows a property value to be expressed as an JavaScript expression
that defines the value relative to other property values or data accessible
......@@ -258,7 +258,7 @@
To remove expressions, select \gui Reset in the context menu.
For more information on the JavaScript environment provided by QML, see
\l{http://doc.qt.nokia.com/4.7/qdeclarativejavascript.html}
\l{http://qt-project.org/doc/qt-4.8/qdeclarativejavascript.html}
{Integrating JavaScript}.
\section2 Marking Text Elements for Translation
......@@ -331,7 +331,7 @@
\section2 Setting Anchors and Margins
In addition to arranging elements in a grid, row, or column, you can use
\l{http://doc.qt.nokia.com/4.7/qml-anchor-layout.html}{anchors} to lay out
\l{http://qt-project.org/doc/qt-4.8/qml-anchor-layout.html}{anchors} to lay out
screens. In an anchor-based layout, each item can be thought of as having a
set of invisible \e anchor lines: top, bottom, left, right, fill, horizontal
center, vertical center, and baseline.
......@@ -389,7 +389,7 @@
a time.
For more information on Transform elements, see
\l {http://doc.qt.nokia.com/4.7/qml-transform.html}{QML Transform Element}.
\l {http://qt-project.org/doc/qt-4.8/qml-transform.html}{QML Transform Element}.
\section1 Adding States
......@@ -428,7 +428,7 @@
\endlist
The \gui State pane displays the different
\l{http://doc.qt.nokia.com/4.7/qdeclarativestates.html}{states}
\l{http://qt-project.org/doc/qt-4.8/qdeclarativestates.html}{states}
of the component in the Qt Quick Designer.
\image qmldesigner-transitions.png "State pane"
......
......@@ -38,9 +38,9 @@
When you write a QML module or use QML from a C++ application you typically
register new types with
\l{http://doc.qt.nokia.com/4.8/qdeclarativeengine.html#qmlRegisterType}
\l{http://qt-project.org/doc/qt-4.8/qdeclarativeengine.html#qmlRegisterType}
{qmlRegisterType} or expose some class instances with
\l{http://doc.qt.nokia.com/4.8/qdeclarativecontext.html#setContextProperty}
\l{http://qt-project.org/doc/qt-4.8/qdeclarativecontext.html#setContextProperty}
{setContextProperty}. The \QC C++ code model now scans for these calls and
tells the QML code model about them. This means that properties are
displayed during code completion and the JavaScript code checker does not
......@@ -56,7 +56,7 @@
For Qt 4.8 and later, one or more \c qmltypes files can be listed in the
\c qmldir file under the \c typeinfo header. These files will be read in
addition to \c{plugins.qmltypes}. For more information, see
\l{http://doc.qt.nokia.com/4.8/qdeclarativemodules.html#writing-a-qmldir-file}
\l{http://qt-project.org/doc/qt-4.8/qdeclarativemodules.html#writing-a-qmldir-file}
{Writing a qmldir File}.
\section1 Generating qmltypes Files
......
......@@ -64,23 +64,23 @@
\section1 Using Data Models
You can create the following types of views to organize items provided by
\l{http://doc.qt.nokia.com/4.7/qdeclarativemodels.html}{data models}:
\l{http://qt-project.org/doc/qt-4.8/qdeclarativemodels.html}{data models}:
\list
\o \l{http://doc.qt.nokia.com/4.7/qml-gridview.html}{Grid View}
\o \l{http://qt-project.org/doc/qt-4.8/qml-gridview.html}{Grid View}
provides a grid vizualization of a model.
\o \l{http://doc.qt.nokia.com/4.7/qml-listview.html}{List View}
\o \l{http://qt-project.org/doc/qt-4.8/qml-listview.html}{List View}
provides a list vizualization of a model.
\o \l{http://doc.qt.nokia.com/4.7/qml-pathview.html}{Path View}
\o \l{http://qt-project.org/doc/qt-4.8/qml-pathview.html}{Path View}
visualizes the contents of a model along a path.
\endlist
When you add a Grid View, List View, or Path View element, the
\l{http://doc.qt.nokia.com/4.7/qml-listmodel.html}{ListModel} and the
\l{http://qt-project.org/doc/qt-4.8/qml-listmodel.html}{ListModel} and the
delegate component that creates an instance for each item in the model are
added automatically. You can edit element properties
\if defined(qcmanual)
......@@ -95,17 +95,17 @@
\list
\o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-column.html}{Column}
\o \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-column.html}{Column}
arranges its child items vertically.
\o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-row.html}{Row}
\o \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-row.html}{Row}
arranges its child items horizontally.
\o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-grid.html}{Grid}
\o \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-grid.html}{Grid}
arranges its child items so that they are aligned in a grid and
are not overlapping.
\o \l{http://doc.qt.nokia.com/4.7-snapshot/qml-flow.html}{Flow}
\o \l{http://qt-project.org/doc/qt-4.8-snapshot/qml-flow.html}{Flow}
arranges its child items side by side, wrapping as necessary.
\endlist
......@@ -211,14 +211,15 @@
use different types of animated transitions. For example, you can animate
changes to property values and colors. You can use rotation animation to
control the direction of rotation. For more information, see
\l{http://doc.qt.nokia.com/4.7/qdeclarativeanimation.html}{QML Animation}.
\l{http://qt-project.org/doc/qt-4.8/qdeclarativeanimation.html}
{QML Animation}.
You can use the \c ParallelAnimation element to start several animations at
the same time. Or use the \c SequentialAnimation element to run them one
after another.
You can use the code editor to specify transitions. For more information,
see \l{http://doc.qt.nokia.com/4.7/qml-transition.html}
see \l{http://qt-project.org/doc/qt-4.8/qml-transition.html}
{QML Transition Element}.
*/
......@@ -237,18 +238,18 @@
\list
\o \l{http://doc.qt.nokia.com/4.7/qml-flickable.html}{Flickable}
\o \l{http://qt-project.org/doc/qt-4.8/qml-flickable.html}{Flickable}
items can be flicked horizontally or vertically.
\o \l{http://doc.qt.nokia.com/4.7/qml-flipable.html}{Flipable}
\o \l{http://qt-project.org/doc/qt-4.8/qml-flipable.html}{Flipable}
items can be flipped between their front and back sides by using
rotation, state, and transition.
\o \l{http://doc.qt.nokia.com/4.7/qml-focusscope.html}{Focus Scope}
\o \l{http://qt-project.org/doc/qt-4.8/qml-focusscope.html}{Focus Scope}
assists in keyboard focus handling when building reusable QML
components.
\o \l{http://doc.qt.nokia.com/4.7/qml-mousearea.html}{Mouse Area}
\o \l{http://qt-project.org/doc/qt-4.8/qml-mousearea.html}{Mouse Area}
enables simple mouse handling.
\endlist
......
......@@ -49,8 +49,8 @@
\section1 Previewing Images
The Qt Quick Toolbar for images allows you to edit the properties of
\l{http://doc.qt.nokia.com/latest/qml-borderimage.html}{Border Image}
and \l{http://doc.qt.nokia.com/latest/qml-image.html}{Image} components.
\l{http://qt-project.org/doc/qt-4.8/qml-borderimage.html}{Border Image}
and \l{http://qt-project.org/doc/qt-4.8/qml-image.html}{Image} components.
You can scale and tile the images, replace them with other images,
preview them, and change the image margins.
......@@ -64,7 +64,7 @@
\section1 Formatting Text
The Qt Quick Toolbar for text allows you to edit the properties of
\l{http://doc.qt.nokia.com/latest/qml-text.html}{Text} components.
\l{http://qt-project.org/doc/qt-4.8/qml-text.html}{Text} components.
You can change the font family and size as well as text formatting, style,
alignment, and color.
......@@ -80,7 +80,7 @@
\section1 Previewing Animation
The Qt Quick Toolbar for animation allows you to edit the properties of
\l{http://doc.qt.nokia.com/4.7/qml-propertyanimation.html}
\l{http://qt-project.org/doc/qt-4.8/qml-propertyanimation.html}
{PropertyAnimation} components and the components that inherit it. You can
change the easing curve type and duration. For some curves, you can also
specify amplitude, period, and overshoot values.
......@@ -92,7 +92,7 @@
\section1 Editing Rectangles
The Qt Quick Toolbar for rectangles allows you to edit the properties of
\l{http://doc.qt.nokia.com/4.7/qml-rectangle.html}{Rectangle}
\l{http://qt-project.org/doc/qt-4.8/qml-rectangle.html}{Rectangle}
components. You can change the fill and border colors and add
gradients.
......
......@@ -33,7 +33,7 @@
This tutorial describes how to use \QC to create a small Qt application,
Text Finder. It is a simplified version of the QtUiTools
\l{http://doc.qt.nokia.com/4.7/uitools-textfinder.html}{Text Finder}
\l{http://qt-project.org/doc/qt-4.8/uitools-textfinder.html}{Text Finder}
example. The application user interface is constructed from Qt widgets by
using \QD. The application logic is written in C++ by using the code editor.
......@@ -197,7 +197,7 @@
\endlist
For more information about designing forms with \QD, see the
\l{http://doc.qt.nokia.com/4.7/designer-manual.html}{Qt Designer Manual}.
\l{http://qt-project.org/doc/qt-4.8/designer-manual.html}{Qt Designer Manual}.
\section2 Completing the Header File
......@@ -231,7 +231,7 @@
\o Add code to load a text file using QFile, read it with QTextStream,
and then display it on \c{textEdit} with
\l{http://doc.qt.nokia.com/4.7/qtextedit.html#plainText-prop}
\l{http://qt-project.org/doc/qt-4.8/qtextedit.html#plainText-prop}
{setPlainText()}.
This is illustrated by the following code snippet:
......@@ -244,7 +244,8 @@
\o For the \c{on_findButton_clicked()} slot, add code to extract the
search string and use the
\l{http://doc.qt.nokia.com/4.7/qtextedit.html#find}{find()} function
\l{http://qt-project.org/doc/qt-4.8/qtextedit.html#find}{find()}
function
to look for the search string within the text file. This is
illustrated by the following code snippet:
......
......@@ -37,7 +37,7 @@
\image qtcreator-formedit.png
For more information about \QD, see the
\l{http://doc.qt.nokia.com/4.7/designer-manual.html}{Qt Designer Manual}.
\l{http://qt-project.org/doc/qt-4.8/designer-manual.html}{Qt Designer Manual}.
Generally, the integrated \QD contains the same functions as the standalone
\QD. The following sections describe the differences.
......
......@@ -42,7 +42,7 @@
and to change the default plugin path, see \l{How to Create Qt Plugins}.
For more information about how to create plugins for \QD, see
\l{http://doc.qt.nokia.com/4.7/designer-using-custom-widgets.html}
\l{http://qt-project.org/doc/qt-4.8/designer-using-custom-widgets.html}
{Creating and Using Components for Qt Designer}.
\section1 Locating Qt Designer Plugins
......@@ -76,7 +76,7 @@
\QC uses its own set of Qt Libraries located in the bundle, and therefore,
you need to configure the \QD plugins that you want to use with \QC.
Fore more information about how to deploy applications on Mac OS, see
\l{http://doc.qt.nokia.com/4.7/deployment-mac.html}
\l{http://qt-project.org/doc/qt-4.8/deployment-mac.html}
{Deploying an Application on Mac OS X}.
The following example illustrates how to configure version 5.2.1 of the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment