| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
configure
configure.exe
mkspecs/features/qt.prf
src/corelib/global/qglobal.h
src/corelib/kernel/qobject_p.h
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
|
|\ \
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
| | |
| | |
| | |
| | | |
The Loader item takes the qml/qmlItem functionality from Item and
moves it to a specialized subclass.
|
|\ \ \
| |/ /
|/| /
| |/
| | |
Conflicts:
src/gui/widgets/qlinecontrol_p.h
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
configure.exe
src/corelib/kernel/qmetaobject.cpp
tools/qdoc3/generator.cpp
tools/qdoc3/test/qt-cpp-ignore.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
|
| |
| |
| |
| | |
Reviewed-By: TrustMe
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
configure.exe
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent_p.h
tools/qdoc3/codemarker.cpp
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/generator.cpp
|
| |
| |
| |
| | |
Reviewed-By: TrustMe
|
| |
| |
| |
| | |
Reviewed-By: TrustMe
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
configure.exe
tools/qdoc3/htmlgenerator.cpp
|
| |\ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/boxes/glshaders.cpp
src/gui/graphicsview/qgraphicsitem.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tools/linguist/shared/cpp.cpp
translations/linguist_ja.qm
translations/qt_ru.qm
|
| | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
kinetic-declarativeui
Conflicts:
configure.exe
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/tree.cpp
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
src/gui/text/qfontengine_win.cpp
tools/linguist/shared/cpp.cpp
|
| | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
kinetic-declarativeui
Conflicts:
src/corelib/kernel/kernel.pri
src/corelib/tools/tools.pri
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
|
| | |
| | |
| | |
| | | |
Reviewed-by: Thierry
|
| | |
| | |
| | |
| | | |
Reviewed-By: Kavindra Palaraja <kavindra.palaraja@nokia.com>
|
| |/
| |
| |
| |
| | |
Task-number: 253710
Reviewed-by: Trust Me
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
doc/src/tutorials/declarative.qdoc
|
| | | |
|
| | | |
|
|/ / |
|
| |
| |
| |
| |
| |
| |
| | |
Added snippet comments for qdoc, also qmlconv leaves some
errors. ',' where they are not supposed to be,
] and indenting in the wrong places, lack of " around
enum values.
|
| |
| |
| |
| |
| | |
Structure hasn't changed, just used qmlconv and started adding
snippet tags
|
| |
| |
| |
| |
| | |
A reformat, a couple of extra examples of loading types,
and a start on the contents of chapter 3.
|
| | |
|
| | |
|
|/
|
|
|
|
|
|
|
|
|
| |
Start of qdoc componenet relating to example files.
Also removed t8 and replaced with Final, which will represent
the final 'application', and not necissarily in terms of
minor stages. However difference that will be useful or
confusing to the user will still be highlighted, just not
in the progressive manor of the rest of the tutorial
Scheduled for review when complete.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit 57ce15b2984cb7ccc4ab0b5dc03812d525d52620
Author: David Boddie <dboddie@trolltech.com>
Date: Tue Mar 24 16:55:41 2009 +0100
Removed internal, hidden documentation.
Also fixed the language used, slightly.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
commit 0a81cc2a6dfc98087de92e53d493bed56826642f
Merge: 4bd3eca... dd7b1f1...
Author: David Boddie <dboddie@trolltech.com>
Date: Tue Mar 24 15:24:32 2009 +0100
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
commit 4bd3eca8855bb2564e146be4d0a3bba836d20122
Merge: dc789e3... 1d1c52c...
Author: David Boddie <dboddie@trolltech.com>
Date: Mon Mar 23 19:20:05 2009 +0100
Merge branch 'qt/4.5' of ../qt-45-documentation into 4.5
commit 1d1c52c60995058b61ee35e3970fecc1de3b85b6
Merge: 6c5de23... 381b6cc...
Author: David Boddie <dboddie@trolltech.com>
Date: Mon Mar 23 19:17:37 2009 +0100
Merge branch 'qt/4.5' of git://scm.dev.nokia.troll.no/qt/qt-45 into qt/4.5
commit 6c5de23611baef3c6be59b94ebd29d901056c2fc
Author: David Boddie <dboddie@trolltech.com>
Date: Thu Mar 19 18:26:11 2009 +0100
Fixes: Doc: Fixed typo.
Reviewed-by: David Boddie <dboddie@trolltech.com>
commit 5d710cc183699513b1582507dcb4cddefb91c8ad
Author: David Boddie <dboddie@trolltech.com>
Date: Thu Mar 19 18:24:31 2009 +0100
Fixes: Doc: Made it clearer what qDebug() actually does.
Reviewed-by: David Boddie <dboddie@trolltech.com>
commit 1fae0b3b34bf066e2356671a5c6187485b2b587d
Author: David Boddie <dboddie@trolltech.com>
Date: Thu Mar 19 17:53:09 2009 +0100
Fixes: Doc: Added a note about not modifying the text document in a paint event handler.
Task-number: 246550
Reviewed-by: David Boddie <dboddie@trolltech.com>
commit 29662d44de9b42d811e60a1b57d871335888373a
Author: David Boddie <dboddie@trolltech.com>
Date: Thu Mar 19 17:04:07 2009 +0100
Fixes: Doc: Fixed styling of code in this tutorial.
Task-number: 247053
Reviewed-by: David Boddie <dboddie@trolltech.com>
commit 630c11d6f9f20d5f99bc964efaf4b39daaeb32c4
Author: David Boddie <dboddie@trolltech.com>
Date: Thu Mar 19 15:19:24 2009 +0100
Fixes: Doc: Note the use of just the name of a method rather than a complete signature.
Task-number: 247857
Reviewed-by: David Boddie <dboddie@trolltech.com>
|
|
|