summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-03-04 18:22:02 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-03-04 18:22:02 (GMT)
commit2542f8b565e90378145c048b3a6982f4749c6392 (patch)
treed48a2a8988a778e16cf73aac4d0b5709b82f0082 /doc
parent4f2203e481cc1663776e7b87b082cf0dd42849fd (diff)
parent364ba2bfeeab574d2ae940e4387d3c90b2a46dcd (diff)
downloadQt-2542f8b565e90378145c048b3a6982f4749c6392.zip
Qt-2542f8b565e90378145c048b3a6982f4749c6392.tar.gz
Qt-2542f8b565e90378145c048b3a6982f4749c6392.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc')
-rw-r--r--doc/doc.pri11
-rw-r--r--doc/src/declarative/advtutorial.qdoc5
-rw-r--r--doc/src/declarative/basictypes.qdoc2
-rw-r--r--doc/src/modules.qdoc1
-rw-r--r--doc/src/platforms/emb-pointer.qdoc6
-rw-r--r--doc/src/qt4-intro.qdoc25
-rw-r--r--doc/src/snippets/code/doc_src_emb-pointer.qdoc5
-rw-r--r--doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp5
8 files changed, 50 insertions, 10 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
index aea5b08..3d04049 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -43,11 +43,11 @@ win32-g++:isEmpty(QMAKE_SH) {
# Build rules:
adp_docs.commands = ($$QDOC $$ADP_DOCS_QDOCCONF_FILE)
-adp_docs.depends += sub-tools # qdoc3
+adp_docs.depends += sub-qdoc3 # qdoc3
qch_docs.commands = $$QT_DOCUMENTATION
-qch_docs.depends += sub-tools
+qch_docs.depends += sub-qdoc3
-docs.depends = adp_docs qch_docs
+docs.depends = sub-qdoc3 adp_docs qch_docs
docs_zh_CN.depends = docs
docs_zh_CN.commands = $$QT_ZH_CN_DOCUMENTATION
@@ -64,5 +64,8 @@ qchdocs.CONFIG += no_check_exist
docimages.files = $$QT_BUILD_TREE/doc/src/images
docimages.path = $$[QT_INSTALL_DOCS]/src
-QMAKE_EXTRA_TARGETS += qdoc adp_docs qch_docs docs docs_zh_CN
+sub-qdoc3.depends = sub-corelib sub-xml
+sub-qdoc3.commands += (cd tools/qdoc3 && $(MAKE))
+
+QMAKE_EXTRA_TARGETS += sub-qdoc3 adp_docs qch_docs docs docs_zh_CN
INSTALLS += htmldocs qchdocs docimages
diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc
index b7d964c..e420e6d 100644
--- a/doc/src/declarative/advtutorial.qdoc
+++ b/doc/src/declarative/advtutorial.qdoc
@@ -106,6 +106,11 @@ more than just an image. Note that we've set the image to be the size of the ite
This will be used later, when we dynamically create and size the block items the image will be scaled automatically
to the correct size.
+Note that because there are several stages to this tutorial they share images. This is done by having a shared resources
+folder containing the images, and all stages of the tutorial refer to the same shared folder. This is the reason for the
+'../shared/pics' part of the image source. The image source can be any relative or absolute path, and it is relative to the
+location of the file the Image element is in, with ../ meaning to go up one level.
+
You should be familiar with all that goes on in these files so far. This is a
very basic start and doesn't move at all - next we will populate the game canvas
with some blocks.
diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc
index c60847e..6901947 100644
--- a/doc/src/declarative/basictypes.qdoc
+++ b/doc/src/declarative/basictypes.qdoc
@@ -128,7 +128,7 @@
\brief A URL is a resource locator, like a file name.
A URL is a resource locator, like a file name. It can be either
- absolute, e.g. "http://qtsoftware.com", or relative, e.g.
+ absolute, e.g. "http://qt.nokia.com", or relative, e.g.
"pics/logo.png". A relative URL is resolved relative to the URL of
the component where the URL is converted from a JavaScript string
expression to a url property value.
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 9e1d340..76a52b4 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -130,6 +130,7 @@
/*!
\module QtMultimedia
+ \page qtmultimedia-module.html
\title QtMultimedia Module
\contentspage All Qt Modules
\previouspage QtCore
diff --git a/doc/src/platforms/emb-pointer.qdoc b/doc/src/platforms/emb-pointer.qdoc
index 34510da..3c37b63 100644
--- a/doc/src/platforms/emb-pointer.qdoc
+++ b/doc/src/platforms/emb-pointer.qdoc
@@ -154,9 +154,9 @@
in the build environment.
The tslib sources can be downloaded from \l
- http://tslib.berlios.de. Use the \c configure script's -L and
- -I options to explicitly specify the location of the library and
- its headers:
+ http://tslib.berlios.de. Specify the location of the library and
+ its headers using -L and -I options in the \c qmake.conf file in
+ your \c mkspec. Also it can be helpful to add a -rpath-link:
\snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 7
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index cf53df0..c670c51 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -473,6 +473,29 @@
\section1 Declarative UI development with Qt Quick
+ Qt 4.7 introduces Quick, the Qt UI Creation Kit. that enables the creation
+ of dynamic user interfaces, easier and more effective than possible
+ with existing UI technologies. This UI Creation Kit consist of three
+ technologies:
+
+ \list
+ \i QML is a declarative language oriented on JavaScript that utilizes
+ Qt's Meta-Object capabilities to enable designers and developers to
+ collaborate tightly and create animated and fluid user experiences,
+ using existing knowledge in script language and design.
+
+ \i QtDeclarative is a C++ library that provides the underlying engine,
+ which translates the declarative description of the UI in QML into
+ items on a QGraphicsScene. The library also provides APIs to bind
+ custom C++ types and elements to QML, and to connect the QML UI with
+ the underlying application logic written in C++.
+
+ \i Qt Creator has been improved to support interactive editing of
+ QML UIs through drag-and-drop. The text editor supports the QML
+ syntax and provides authoring assistance such as auto-completion,
+ error lookup, help lookup and easy preview of QML UI's.
+ \endlist
+
\section1 Network Bearer Management
Bearer Management controls the connectivity state of the system.
@@ -494,7 +517,7 @@
\section1 New Classes, Functions, Macros, etc.
- Links to new classes, functions, macros, and other items
+ Links to new classes, elements, functions, macros, and other items
introduced in Qt 4.7.
\sincelist 4.7
diff --git a/doc/src/snippets/code/doc_src_emb-pointer.qdoc b/doc/src/snippets/code/doc_src_emb-pointer.qdoc
index 9661ae5..0d66e18 100644
--- a/doc/src/snippets/code/doc_src_emb-pointer.qdoc
+++ b/doc/src/snippets/code/doc_src_emb-pointer.qdoc
@@ -77,7 +77,10 @@ export QWS_MOUSE_PROTO="Vr41xx:press=500:/dev/misc/ts"
//! [7]
-./configure -L <path to tslib library> -I <path to tslib headers>
+....
+QMAKE_CFLAGS += -I<path to tslib headers>
+QMAKE_LFLAGS += -L<path to tslib library> -Wl,-rpath-link=<path to tslib library>
+....
//! [7]
diff --git a/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp b/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp
index bff72a0..19e37ba 100644
--- a/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp
+++ b/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp
@@ -108,3 +108,8 @@ int id = qRegisterMetaType<MyStruct>();
int id = qMetaTypeId<QString>(); // id is now QMetaType::QString
id = qMetaTypeId<MyStruct>(); // compile error if MyStruct not declared
//! [8]
+
+//! [9]
+typedef QString CustomString;
+qRegisterMetaType<CustomString>("CustomString");
+//! [9]